refactoring & more es6