Unifying text normalization with other code

Unifying text normalization with other code. Now all three places (annotator, matcher and mapper) have equal code.