don't use ES6 array initialization
Ux tidyups