Some manual tidying.