lower code smells

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