Merge pull request #3 from omsmith/cleanup

Sweet!