ADEN-1153 Code Review changes