Tidy up for pull request