misc tidying up
tidying up