Minor refactoring

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