Cleanup app.rb mostly + a few rubocop warnings