cleaning up and preparing application.rb