Refactor of Controller to inline services call