Refactoring!

Signed-off-by: Bysheva Tatyana <bysheva.tatyana@gmail.com>