Team controller refactoring