applied refactoring
changed collection processing in normalization
removed class constraint in normalization logic
refactoring: added comments