switched many functions to arrow functions
simplified style functions