BAZYNGO-736
refactoring