doing some tidying up