finish moving to es6