Code refactoring. Structure normalizing.