Added comments handling to TODO