Get rid of #TODO

Using the `regexp` instead of `gsub`.