Moved and renamed methods appropriately into team.py
Refactored methods to reduce coupling