Use destructuring in ES2015 and write more concise code