some clean up
merging before pushing to github