Cleaning up the code.
Merge pull request #5 from colefichter/removing_cruft

Cleaning up the code.