I couldn't take it anymore
Merge pull request #7 from mreiferson/cleanup_7

cleanup