#9 Refactor the file - remove the database settings