Use more es6