Improved readability of Databasehandler class