don't pass  as array as it makes it harder to identify what can be altered upstream
Merge pull request #3200 from eileenmcnaughton/code_tidy_up

Code tidy up