ADEN-1074 Code Review changes