ADEN-1541 Code review changes