Refactored some methods from Team Class