--- a/doc/TODO	Sat Jul 26 15:05:09 2014 -0500
+++ b/doc/TODO	Sat Jul 26 15:26:32 2014 -0500
@@ -40,3 +40,4 @@
 - Specify from command line where to search for a configuration file.
 - Manager should prevent two repositories from using the same display name.
 - Manager should prevent two administrators from editing the same repository.
+- Manager should list all managed repositories like Display_Name(Storage_Name).

--- a/src/configuration.py	Sat Jul 26 15:05:09 2014 -0500
+++ b/src/configuration.py	Sat Jul 26 15:26:32 2014 -0500
@@ -19,12 +19,6 @@
 #**  along with this program. If not, see <http://www.gnu.org/licenses/>.    ***
 #*******************************************************************************
 
-"""
- IMPORTS
-"""
-from ConfigParser import SafeConfigParser
-
-
 class Manager(object):
 	""" Manages the configurations for HgWebManager """
 	# The configuration file parser.
@@ -64,6 +58,8 @@
 
 			@param[in] path	The path and file name of the configuration file.
 		"""
+		from ConfigParser import SafeConfigParser
+
 		self.__parser = SafeConfigParser()
 		self.__parser.read(path)
 

--- a/src/hwm.py	Sat Jul 26 15:05:09 2014 -0500
+++ b/src/hwm.py	Sat Jul 26 15:26:32 2014 -0500
@@ -83,7 +83,6 @@
 
 def main(args):
 	import argparse
-	import manrepo
 	import manager
 
 	if not is_hgWeb_user():

--- a/src/manager.py	Sat Jul 26 15:05:09 2014 -0500
+++ b/src/manager.py	Sat Jul 26 15:26:32 2014 -0500
@@ -23,7 +23,6 @@
 """
  IMPORTS
 """
-import manrepo
 from hwm import settings
 
 
@@ -44,24 +43,24 @@
 	import os
 	import shutil
 
-	print "Generating repository: %s" % repository.StorageName
+	print "Adding repository: %s" % repository.StorageName
 	if __doesRepositoryExist(repository):
 		print >>sys.stderr, "The repository '%s' already exists." % repository.StorageName
 		return False
 
 	# Create the requested repository.
-	status = __generateRepository(repository)
+	status = __addRepository(repository)
 	if 0 == status:
-		print "Created repository directory."
+		print "Initialised repository directory."
 	else:
 		print >>sys.stderr, "Failed to create repository directory. OS Error Code:", status
 		return False
 
 	# Fill out the details of about the repository.
 	if __writeRepositoryDetails(repository):
-		print "Wrote repository details."
+		print "Successfully wrote details."
 	else:
-		print >>sys.stderr, "Failed to write repository details."
+		print >>sys.stderr, "Failed to write details."
 		os.chmod(settings.RepositoryPath + os.sep + repository.StorageName + os.sep + '.hg' + os.sep + "hgrc", stat.S_IWRITE)
 		shutil.rmtree(settings.RepositoryPath + os.sep + repository.StorageName)
 		return False
@@ -71,7 +70,7 @@
 		shutil.rmtree(settings.RepositoryPath + os.sep + repository.StorageName)
 		return False
 	else:
-		print 'Repository generated.'
+		print 'Repository added.'
 		return True
 
 def register(repository):
@@ -95,7 +94,7 @@
 
 	# Add the new repository to the web registry.
 	if __registerRepository(repository):
-		print "Registered repository."
+		print "Successfully registered repository."
 		return True
 	else:
 		print >>sys.stderr, "Failed to register repository."
@@ -116,9 +115,10 @@
 	 @return When the modification is successful gives true, else-wise false.
 	"""
 	import sys
+	from manrepo import Repository
 
 	print "Modifying repository: " + currentStorageName
-	oldRepository = manrepo.Repository(currentStorageName)
+	oldRepository = Repository(currentStorageName)
 
 	if not __doesRepositoryExist(oldRepository):
 		print >>sys.stderr, "The repository '%s' was not found." % oldRepository.StorageName
@@ -143,9 +143,9 @@
 
 	# Fill out the details of about the new repository.
 	if __writeRepositoryDetails(newRepository):
-		print "Wrote repository new details."
+		print "Successfully wrote new details."
 	else:
-		print >>sys.stderr, "Failed to write repository new details."
+		print >>sys.stderr, "Failed to write new details."
 		if __registerRepository(oldRepository):
 			print "Successfully rolled backed action."
 		else:
@@ -154,11 +154,11 @@
 
 	# Add the new repository to the web registry.
 	if __registerRepository(newRepository):
-		print "Registered %s." % newRepository.StorageName
+		print 'Repository modified.'
+		return True
 	else:
 		print >>sys.stderr, "Failed to register repository."
 		return False
-	return True
 
 def delete(repository):
 	""" Removes an existing repository.
@@ -181,13 +181,13 @@
 
 	print "Removing repository: %s" % repository.StorageName
 	if __unregisterRepository(repository):
-		print "Unregistered repository."
+		print "Successfully unregistered repository."
 	else:
 		print >>sys.stderr, "Failed to unregister repository."
 		return False
 
-	if __deleteRepository(repository):
-		print "Deleted repository."
+	if __removeRepository(repository):
+		print "Repository removed."
 		return True
 	else:
 		print >>sys.stderr, "Failed to delete the repository."
@@ -269,7 +269,7 @@
 		shutil.copyfile(target.name, settings.HgWebPath + os.sep + 'hgweb.config')
 	return foundRepo
 
-def __deleteRepository(repo):
+def __removeRepository(repo):
 	""" Removes an existing Mercurial repository.
 
 	 @pre The requested repository to delete must already exist.
@@ -288,7 +288,7 @@
 	shutil.rmtree(settings.RepositoryPath + os.sep + repo.StorageName)
 	return True
 
-def __generateRepository(repo):
+def __addRepository(repo):
 	""" Initialises a new Mercurial repository.
 
 	 @pre The requested repository to create cannot already exist.
@@ -388,8 +388,6 @@
 	"""
 	import os
 	import sys
-	import shutil
-	import stat
 
 	try:
 		with open(settings.HgWebPath + os.sep + 'hgweb.config', 'a') as hgweb: