general cleanup of the code.
Merge branch 'master' of https://github.com/Naztor/freezing-shame