A bit more tidying