Just mopping up
Merge pull request #43 from chandracarney/cleanup

Just mopping up