fixes + refactoring on normalizer