Improved readability of Database.java