misc cleanup to get heroku app in sync with tutorial walkthrough