Fixed player name clean up logic