code refactored, controller is much simpler and logic is done in a service now