Removed ES6 arrow functions