Tidied up todo list
Removed some duplicate code