Completed TODO
Fixed comment string