Tidied up TODO