Refactored some code to move player sorted logic to Team object