More ES6 refactor updates