some cleanup
Merge pull request #1 from vicb/cleanup

some cleanup