Kamisado: refactoring