tidying up for pull request