Clean up code and improve readability
Merge pull request #14 from grappler/clean-up

Clean up code and improve readability