Code style fixes, comment fixes, refactoring
Excess init() removed
Merge pull request #1 from creocoder/master

Code style fixes, comment fixes, refactoring