clean up in preparation for pull request