Improve the template, clean up database.yml