Minor refactoring

Change-Id: Ib2dfbc9ea6ced47ba8455016adc5963d6ced92ef
Issue-ID: SO-4068
Signed-off-by: waqas.ikram <waqas.ikram@est.tech>
6 files changed