simplify some method names and convert a couple functions to ES6 arrows