Some clean up of code
Merge pull request #7 from garwedgess/patch-3

Some clean up of code