Make TODO list clearer