corrected nits that needed to be fixed
Removed unneeded function, fixed style nit.