Further cleanup of SQLDatabaseManager upgrades
Fix formatting