Simplify code to get a working example on Heroku