Refactoring yaku pattern check 2