diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index b901008af2..0e5e782c42 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -206,7 +206,7 @@ namespace OpenSim.Framework.UserManagement
         /// <summary>
         /// Loads a user agent by uuid (not called directly)
         /// </summary>
-        /// <param name="uuid">The agents UUID</param>
+        /// <param name="uuid">The agent's UUID</param>
         /// <returns>Agent profiles</returns>
         public UserAgentData getUserAgent(LLUUID uuid)
         {
@@ -228,7 +228,7 @@ namespace OpenSim.Framework.UserManagement
         /// <summary>
         /// Loads a user agent by name (not called directly)
         /// </summary>
-        /// <param name="name">The agents name</param>
+        /// <param name="name">The agent's name</param>
         /// <returns>A user agent</returns>
         public UserAgentData getUserAgent(string name)
         {
@@ -256,12 +256,11 @@ namespace OpenSim.Framework.UserManagement
             setUserProfile(profile);
         }
 
-
         /// <summary>
         /// Loads a user agent by name (not called directly)
         /// </summary>
-        /// <param name="fname">The agents firstname</param>
-        /// <param name="lname">The agents lastname</param>
+        /// <param name="fname">The agent's firstname</param>
+        /// <param name="lname">The agent's lastname</param>
         /// <returns>A user agent</returns>
         public UserAgentData getUserAgent(string fname, string lname)
         {
diff --git a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
index c21f89963f..e5cbe45318 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
@@ -158,6 +158,7 @@ namespace OpenSim.Framework.Data.MySQL
                 return null;
             }
         }
+
         public List<OpenSim.Framework.AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
         {
             List<OpenSim.Framework.AvatarPickerAvatar> returnlist = new List<OpenSim.Framework.AvatarPickerAvatar>();
@@ -242,6 +243,7 @@ namespace OpenSim.Framework.Data.MySQL
             }
             return returnlist;
         }
+
         /// <summary>
         /// Searches the database for a specified user profile by UUID
         /// </summary>
@@ -366,11 +368,14 @@ namespace OpenSim.Framework.Data.MySQL
             // Do nothing.
         }
 
-
+        /// <summary>
+        /// Updates a user profile stored in the DB
+        /// </summary>
+        /// <param name="user">The profile data to use to update the DB</param>
         public bool UpdateUserProfile(UserProfileData user)
         {
-            return true;
             // TODO: implement
+            return true;
         }
 
         /// <summary>
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs b/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs
index ddc0694a5d..b9a1daada4 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs
@@ -82,7 +82,6 @@ namespace OpenSim.Framework.Data.SQLite
             MainLog.Instance.Verbose("DATASTORE", "Populated Intentory Items Definitions");
 
             ds.AcceptChanges();
-            return;
         }
 
         public InventoryItemBase buildItem(DataRow row)
@@ -377,7 +376,7 @@ namespace OpenSim.Framework.Data.SQLite
         /// Delete all items in the specified folder
         /// </summary>
         /// <param name="folderId">id of the folder, whose item content should be deleted</param>
-        //!TODO, this is horribly inefficient, but I don't want to ruin the overall structure of this implementatio
+        //!TODO, this is horribly inefficient, but I don't want to ruin the overall structure of this implementation
         private void deleteItemsInFolder(LLUUID folderId)
         {
             List<InventoryItemBase> items = getInventoryInFolder(folderId);
@@ -404,7 +403,6 @@ namespace OpenSim.Framework.Data.SQLite
             addFolder(folder);
         }
 
-
         /// <summary>
         /// Delete a folder
         /// </summary>
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs b/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
index d7f4b8586f..da272776b6 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
@@ -33,14 +33,11 @@ using Mono.Data.SqliteClient;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
 
-
 namespace OpenSim.Framework.Data.SQLite
 {
     /// <summary>
-    /// A User storage interface for the DB4o database system
+    /// A User storage interface for the SQLite database system
     /// </summary>
-    /// 
-   
 
     public class SQLiteUserData : SQLiteBase, IUserData
     {
@@ -78,7 +75,7 @@ namespace OpenSim.Framework.Data.SQLite
         /// <summary>
         /// Loads a specified user profile from a UUID
         /// </summary>
-        /// <param name="uuid">The users UUID</param>
+        /// <param name="uuid">The user's UUID</param>
         /// <returns>A user profile</returns>
         public UserProfileData GetUserByUUID(LLUUID uuid)
         {
@@ -105,8 +102,8 @@ namespace OpenSim.Framework.Data.SQLite
         /// <summary>
         /// Returns a user by searching for its name
         /// </summary>
-        /// <param name="name">The users account name</param>
-        /// <returns>A matching users profile</returns>
+        /// <param name="name">The user's account name</param>
+        /// <returns>A matching user profile</returns>
         public UserProfileData GetUserByName(string name)
         {
             return GetUserByName(name.Split(' ')[0], name.Split(' ')[1]);
@@ -115,9 +112,9 @@ namespace OpenSim.Framework.Data.SQLite
         /// <summary>
         /// Returns a user by searching for its name
         /// </summary>
-        /// <param name="fname">The first part of the users account name</param>
-        /// <param name="lname">The second part of the users account name</param>
-        /// <returns>A matching users profile</returns>
+        /// <param name="fname">The first part of the user's account name</param>
+        /// <param name="lname">The second part of the user's account name</param>
+        /// <returns>A matching user profile</returns>
         public UserProfileData GetUserByName(string fname, string lname)
         {
             string select = "surname = '" + lname + "' and username = '" + fname + "'";
@@ -191,8 +188,8 @@ namespace OpenSim.Framework.Data.SQLite
         /// <summary>
         /// Returns a user by UUID direct
         /// </summary>
-        /// <param name="uuid">The users account ID</param>
-        /// <returns>A matching users profile</returns>
+        /// <param name="uuid">The user's account ID</param>
+        /// <returns>A matching user profile</returns>
         public UserAgentData GetAgentByUUID(LLUUID uuid)
         {
             try
@@ -209,7 +206,7 @@ namespace OpenSim.Framework.Data.SQLite
         /// Returns a session by account name
         /// </summary>
         /// <param name="name">The account name</param>
-        /// <returns>The users session agent</returns>
+        /// <returns>The user's session agent</returns>
         public UserAgentData GetAgentByName(string name)
         {
             return GetAgentByName(name.Split(' ')[0], name.Split(' ')[1]);
@@ -218,8 +215,8 @@ namespace OpenSim.Framework.Data.SQLite
         /// <summary>
         /// Returns a session by account name
         /// </summary>
-        /// <param name="fname">The first part of the users account name</param>
-        /// <param name="lname">The second part of the users account name</param>
+        /// <param name="fname">The first part of the user's account name</param>
+        /// <param name="lname">The second part of the user's account name</param>
         /// <returns>A user agent</returns>
         public UserAgentData GetAgentByName(string fname, string lname)
         {
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 1471f89fec..542c5cdd7a 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -164,20 +164,13 @@ namespace OpenSim
                 config.Set("physics", "basicphysics");
                 config.Set("verbose", true);
                 config.Set("physical_prim", true);
-                
                 config.Set("child_get_tasks", false);
-
                 config.Set("serverside_object_permissions", false);
-
                 config.Set("storage_plugin", "OpenSim.DataStore.NullStorage.dll");
-
                 config.Set("startup_console_commands_file", "");
                 config.Set("shutdown_console_commands_file", "");
-
                 config.Set("script_engine", "DotNetEngine");
-
                 config.Set("asset_database", "sqlite");
-                
             }
 
             if (m_config.Configs["StandAlone"] == null)
@@ -201,7 +194,6 @@ namespace OpenSim
             {
                 config.Set("default_location_x", 1000);
                 config.Set("default_location_y", 1000);
-
                 config.Set("http_listener_port", NetworkServersInfo.DefaultHttpListenerPort);
                 config.Set("remoting_listener_port", NetworkServersInfo.RemotingListenerPort);
                 config.Set("grid_server_url", "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString());
@@ -214,7 +206,6 @@ namespace OpenSim
                 config.Set("inventory_server_url", "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort.ToString());
             }
 
-
             if (m_config.Configs["RemoteAdmin"] == null)
                 m_config.AddConfig("RemoteAdmin");
             config = m_config.Configs["RemoteAdmin"];
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 653077f2d1..0514df54b7 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -202,7 +202,6 @@ namespace OpenSim.Region.ClientStack
 
         # region Client Methods
 
-
         public void Close()
         {
             // Pull Client out of Region
diff --git a/OpenSim/Region/ClientStack/PacketServer.cs b/OpenSim/Region/ClientStack/PacketServer.cs
index e56a0b8919..945bb822bf 100644
--- a/OpenSim/Region/ClientStack/PacketServer.cs
+++ b/OpenSim/Region/ClientStack/PacketServer.cs
@@ -104,7 +104,6 @@ namespace OpenSim.Region.ClientStack
             CloseClient(client);
         }
 
-
         /// <summary>
         /// 
         /// </summary>
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 82a5c3cc3c..fd7e04fa93 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -128,8 +128,8 @@ namespace OpenSim.Region.ClientStack
             {
                 masterAvatar =
                     m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarFirstName,
-                                                           scene.RegionInfo.MasterAvatarLastName,
-                                                           scene.RegionInfo.MasterAvatarSandboxPassword);
+                                                               scene.RegionInfo.MasterAvatarLastName,
+                                                               scene.RegionInfo.MasterAvatarSandboxPassword);
             }
 
             if (masterAvatar != null)
diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs
index 21e4359cdf..8095646f3a 100644
--- a/OpenSim/Region/ClientStack/UDPServer.cs
+++ b/OpenSim/Region/ClientStack/UDPServer.cs
@@ -71,6 +71,7 @@ namespace OpenSim.Region.ClientStack
             }
             
         }
+
         public ulong RegionHandle
         {
             get
diff --git a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
index 86ddfaf97f..0b95aee166 100644
--- a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
+++ b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
@@ -67,7 +67,6 @@ namespace OpenSim.Region.Environment.Modules
             }
         }
 
-
         public void Initialise(Scene scene, IConfigSource source)
         {
             scene.RegisterModuleInterface<IAvatarFactory>(this);
@@ -136,7 +135,6 @@ namespace OpenSim.Region.Environment.Modules
                                     avatAppearance.Wearables[wear.Type].ItemID = wear.ItemID;
                                 }
                             }
-
                         }
                     }
                 }
@@ -159,7 +157,5 @@ namespace OpenSim.Region.Environment.Modules
             }
             return visualParams;
         }
-
-      
     }
 }