Refactor es5 functions to es6 arrow functions by Mike Sherov