refactoring

Signed-off-by: Alexandr Kriptononv <alexandr.kriptonov@gmail.com>
refactoring

Signed-off-by: Alexandr Kriptononv <alexandr.kriptonov@gmail.com>