diff --git a/common/database.cpp b/common/database.cpp
index b864b30ca..474645b53 100644
--- a/common/database.cpp
+++ b/common/database.cpp
@@ -79,10 +79,11 @@ void Database::DBInitVars() {
 	varcache_max = 0;
 	varcache_lastupdate = 0;
 }
-/*
 
-Close the connection to the database
+/*
+	Close the connection to the database
 */
+
 Database::~Database()
 {
 	unsigned int x;
@@ -95,9 +96,9 @@ Database::~Database()
 }
 
 /*
-Check if there is an account with name "name" and password "password"
-Return the account id or zero if no account matches.
-Zero will also be returned if there is a database error.
+	Check if there is an account with name "name" and password "password"
+	Return the account id or zero if no account matches.
+	Zero will also be returned if there is a database error.
 */
 uint32 Database::CheckLogin(const char* name, const char* password, int16* oStatus) {
 
diff --git a/common/database.h b/common/database.h
index 9815248d1..5c4b31d87 100644
--- a/common/database.h
+++ b/common/database.h
@@ -53,9 +53,9 @@ struct EventLogDetails_Struct {
 };
 
 struct CharacterEventLog_Struct {
-uint32	count;
-uint8	eventid;
-EventLogDetails_Struct eld[255];
+	uint32	count;
+	uint8	eventid;
+	EventLogDetails_Struct eld[255];
 };
 
 struct npcDecayTimes_Struct {
@@ -261,17 +261,11 @@ private:
 	VarCache_Struct**	varcache_array;
 	uint32				varcache_lastupdate;
 
-
-	/*
-	* Groups, utility methods.
-	*/
+	/* Groups, utility methods. */
 	void    ClearAllGroupLeaders();
 	void    ClearAllGroups();
 
-
-	/*
-	* Raid, utility methods.
-	*/
+	/* Raid, utility methods. */
 	void ClearAllRaids();
 	void ClearAllRaidDetails();
 	void ClearAllRaidLeaders();
diff --git a/common/database_conversions.cpp b/common/database_conversions.cpp
index b802f0579..313bc20d7 100644
--- a/common/database_conversions.cpp
+++ b/common/database_conversions.cpp
@@ -458,11 +458,11 @@ bool Database::CheckDatabaseConversions() {
 	// }
 
 	/*
-	Automatic Database Upgrade Script
-	Script: db_update.pl V 1 - the number that world passes to the script will
-	force the script to check for a newer version to update itself with
-	db_update.pl ran_from_world - won't bring up a menu if your database versions match
-	db_update.pl - ran standalone will bring up a menu prompt
+		Automatic Database Upgrade Script
+		Script: db_update.pl V 1 - the number that world passes to the script will
+		force the script to check for a newer version to update itself with
+		db_update.pl ran_from_world - won't bring up a menu if your database versions match
+		db_update.pl - ran standalone will bring up a menu prompt
 	*/
 
 	/* Check for a new version of this script, the arg passed