tidy up for pull request