remove useless comment
remove dead code
correct initialisation order as declared
Merge pull request #21 from cpgf/feature/clean-code

Feature/clean code