Clean up, clean up...
Merge pull request #29 from troyswanson/cleanup-cleanup

Clean up, clean up...