Minor refactoring

Signed-off-by: SergeyKrivohatskiy <s.krivohatskiy@gmail.com>