Converted all of these to ECMAScript6 arrow functions to shorten the lines.