Refactor on controller

Now all data is retrieved in the services