further cleanups to app.rb