Refactor id to classes
Fix typo
Stop skirmish when winner is