initial cleanup done
Merge pull request #119 from kiopelani/henry-cleanup

initial cleanup done