Generalized cleanup.
Merge pull request #2 from cbebry/master

Generalized Cleanup.