Some hard graft tidying things up