Light refactor of controllers