Simplify requirement
Fix database.yml layout