Merge pull request #3200 from eileenmcnaughton/code_tidy_up