Refactor indentation and comments
Merge pull request #2 from theponti/development

Refactor indentation and comments