a bunch of cleanup for latest
Merge pull request #127 from kevmoo/patch-4

a bunch of cleanup for latest