another pass to improve es6 module usage