Clean up app.rb a bit