teamSelector: code cleanup