more refactors out of the controller to services, style updates