* refactor with es6