Tidied up TODO items