Some refactoring

Signed-off-by: Laentir Valetov <laex@bk.ru>