removed code smells

Issue-ID: PORTAL-865
Change-Id: I9940591ac0a176b961347950525c5bdf3ae06bf0
Signed-off-by: Rupinder <rupinsi1@in.ibm.com>
7 files changed