tidying some more