Documenting and adjusting the TODOs