cleaned up code for final heroku push