final cleanup and prep for pull-request