Indent files, remove unnecessary returns and made some minor refactors
Merge pull request #170 from marpo60/minor_refactor_and_indentation

Indent files, remove unnecessary returns and made some minor refactors