ADEN-787 Clearer code