Some style improvements
Tidy
Merge branch 'master' of github.com:michaelzoidl/entertain.io