refactored expression normalization