no ssl on heroku
Refactoring a bit
Minor renaming