Merge pull request #1 from kevmoo/master

bit of cleanup