Refactoring all code from players to people