a bit of a cleanup
Merge pull request #21 from psi29a/purging

a bit of a cleanup