Refactor controllers declaration