Refactoring

Signed-off-by: Konctantin <gawrilyako@gmail.com>
fix

Signed-off-by: Konctantin <gawrilyako@gmail.com>