Fixing code smells

Change-Id: I64289f09e7881e0f706a0b4ff657a080bc904aca
Issue-ID: SO-4052
Signed-off-by: waqas.ikram <waqas.ikram@est.tech>
3 files changed