fixed code smells

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