misc cleanup
Merge pull request #29 from vicb/0716-cleanup

misc cleanup