Code tidying following another review round