Feature/refactoring

Слиты effective-dev-opensource запросил слияние feature/refactoring в develop

Created by: Radch-enko