Formatting tweaks, getting ready for Heroku