minor code tidy ups
minor code tidy ups - in don't pass  as ref per std we have been moving to
Merge pull request #3300 from eileenmcnaughton/code-cleanup

merging this - we've discussed removing those & before function names & passing ids as reference before - nothing too complex in there