Merge pull request #3435 from eileenmcnaughton/code-tidies