Bunch more tidying