todo note
some tidying up