[AKQAKIEV-29] minor refactoring