Be more explicit about TODOs