Homogenize comments and TODOs