clean up some for pull request