refactor player / team