Added comments
Fixed merge conflict with TodoHardnessComparator