#50 yet more tidying