cleanup.
Merge pull request #58 from zimmerst/cleanup

cleanup.