Clean up code
Merge pull request #2 from grappler/master

Make code conform to the coding standards