ADEN-1514 Code review updates