Made zscore normalization a config
Refactored normalization