BAC-1265 small post code review changes