Just some more tidying