Indent and structure code
Merge pull request #2 from Slipsager/Code-review

Indent and structure code