Refactorings and creation of class Team