a bit if tidying up