IDEX-1493 - setting constants & minor polish