Refactoring samegame