Cleaned up the todo list