VID-2127 convert arrays to new syntax. Make what was ugly beautiful