Minor cleanup
Merge pull request #8 from dustinfarris/cleanup

Clean up the mess