Clean up a bit.
Merge pull request #1 from waugh/jw_cleanup

Clean up a bit.