cleanin up es6