Makes the TODOs consistent