more es6 consistency.