Just a little more tidying