Merge pull request #121 from GuillaumeGomez/master

Code has been made prettier and easier to understand
code clean up
Merge pull request #125 from jeremyletang/clean-code

code clean up