Made the TODO list shorter