Small changes
Heroku ready
Refactoring