Refactor: be player-count agnostic(#72)