#50 some more tidying.