reFACTORing

Signed-off-by: in0k <val@kreit.ru>