Refactored tab space in team class