Clean up code
Merge pull request #1 from nathggns/jon-master

Just clean up the code