refactoring

Signed-off-by: Shepilov Vladislav <shepilov.v@progforce.com>