misc cleanup
Merge pull request #23 from vicb/cleanup

misc cleanup