Move normalization into commands