CB-7205 Improvemetns as per code review