some tidying up proper