A bit more tidying up