Handle TODOs and commented code