Change all functions to ES6 arrow notation