...refactoring

Signed-off-by: Yakov Goldberg <yakov.goldberg@gmail.com>