more es6ification