Refactor in controllers and services for respect DI