Use ES6 shorthand properties in object literals, #100