improved the todo comments