added normalizer
more refactorings