A wee bit of tidying up