Few ES6 adjustments