some ES6 cleanup