tidying up mainly