further tidy up pending submission for pull request