tidying up a bit