heroku compatibility, stylistic changes ongoing