Better style for address normalization