lowered code smells

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