string normalization improvements