cleanups
Merge pull request #95 from cordoval/more-cordoval-work

cleanups