More ES6ifiction + style in sorter