Update to ES6 initializer format