clearned up the code
Merge pull request #2 from TonyAbell/master

clearned up the code