Cleaned code and added descriptions
Merge branch 'master' of https://github.com/davidag/becode-refactoring