Code tidy.
Merge pull request #2 from cdjackson/master

Code tidy.