tidied TODO