Code cleanup
Merge pull request #65 from brentongunning/master

Code cleanup