Simplify the Team controller a bit