diff --git a/eos/db/saveddata/databaseRepair.py b/eos/db/saveddata/databaseRepair.py
index c65b2fcd2..6c32695a6 100644
--- a/eos/db/saveddata/databaseRepair.py
+++ b/eos/db/saveddata/databaseRepair.py
@@ -85,8 +85,7 @@ class DatabaseCleanup:
                 logger.error("More than one uniform damage pattern found.")
             else:
                 uniform_damage_pattern_id = rows[0]['ID']
-                update_query = "UPDATE 'fits' SET 'damagePatternID' = " + str(uniform_damage_pattern_id) + \
-                               " WHERE damagePatternID NOT IN (SELECT ID FROM damagePatterns) OR damagePatternID IS NULL"
+                update_query = "UPDATE 'fits' SET 'damagePatternID' = {} WHERE damagePatternID NOT IN (SELECT ID FROM damagePatterns) OR damagePatternID IS NULL".format(uniform_damage_pattern_id)
                 update_results = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, update_query)
                 logger.error("Database corruption found. Cleaning up %d records.", update_results.rowcount)
 
@@ -167,7 +166,7 @@ class DatabaseCleanup:
         # See issue #954
         for table in ['drones', 'cargo', 'fighters']:
             logger.debug("Running database cleanup for orphaned %s items.", table)
-            query = "SELECT COUNT(*) AS num FROM " + table + " WHERE itemID IS NULL OR itemID = '' or itemID = '0' or fitID IS NULL OR fitID = '' or fitID = '0'"
+            query = "SELECT COUNT(*) AS num FROM {} WHERE itemID IS NULL OR itemID = '' or itemID = '0' or fitID IS NULL OR fitID = '' or fitID = '0'".format(table)
             results = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, query)
 
             if results is None:
@@ -176,13 +175,13 @@ class DatabaseCleanup:
             row = results.first()
 
             if row and row['num']:
-                query = "DELETE FROM " + table + " WHERE itemID IS NULL OR itemID = '' or itemID = '0' or fitID IS NULL OR fitID = '' or fitID = '0'"
+                query = "DELETE FROM {} WHERE itemID IS NULL OR itemID = '' or itemID = '0' or fitID IS NULL OR fitID = '' or fitID = '0'".format(table)
                 delete = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, query)
                 logger.error("Database corruption found. Cleaning up %d records.", delete.rowcount)
 
         for table in ['modules']:
             logger.debug("Running database cleanup for orphaned %s items.", table)
-            query = "SELECT COUNT(*) AS num FROM " + table + " WHERE itemID = '0' or fitID IS NULL OR fitID = '' or fitID = '0'"
+            query = "SELECT COUNT(*) AS num FROM {} WHERE itemID = '0' or fitID IS NULL OR fitID = '' or fitID = '0'".format(table)
             results = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, query)
 
             if results is None:
@@ -191,7 +190,7 @@ class DatabaseCleanup:
             row = results.first()
 
             if row and row['num']:
-                query = "DELETE FROM " + table + " WHERE itemID = '0' or fitID IS NULL OR fitID = '' or fitID = '0'"
+                query = "DELETE FROM {} WHERE itemID = '0' or fitID IS NULL OR fitID = '' or fitID = '0'".format(table)
                 delete = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, query)
                 logger.error("Database corruption found. Cleaning up %d records.", delete.rowcount)
 
@@ -202,7 +201,7 @@ class DatabaseCleanup:
         for profileType in ['damagePatterns', 'targetResists']:
             for damageType in ['em', 'thermal', 'kinetic', 'explosive']:
                 logger.debug("Running database cleanup for null %s values. (%s)", profileType, damageType)
-                query = "SELECT COUNT(*) AS num FROM " + profileType + " WHERE " + damageType + "Amount IS NULL OR " + damageType + "Amount = ''"
+                query = "SELECT COUNT(*) AS num FROM {0} WHERE {1}Amount IS NULL OR {1}Amount = ''".format(profileType, damageType)
                 results = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, query)
 
                 if results is None:
@@ -211,7 +210,7 @@ class DatabaseCleanup:
                 row = results.first()
 
                 if row and row['num']:
-                    query = "UPDATE '" + profileType + "' SET '" + damageType + "Amount' = '0' WHERE " + damageType + "Amount IS NULL OR emAmount = ''"
+                    query = "UPDATE '{0}' SET '{1}Amount' = '0' WHERE {1}Amount IS NULL OR Amount = ''".format(profileType, damageType)
                     delete = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, query)
                     logger.error("Database corruption found. Cleaning up %d records.", delete.rowcount)