more cleanup, es6