Small tidyup changes from pull request