Fixed duplicate entries when adding/removing players
Some refractoring