tidied up todo