tidied up todos