Cleaned up some of my code.
Merge pull request #19 from b91961/master

Cleaned up some of my code.