Beautified the code
Merge pull request #16 from jacketattack/cleanup

Beautified the code