clean up es6 modules a bit