diff --git a/sudoku.en.cc b/sudoku.en.cc
index cbbc16e..9c79a7e 100644
--- a/sudoku.en.cc
+++ b/sudoku.en.cc
@@ -139,12 +139,9 @@ bool Sudoku::eliminate(int k, int val) {
 int Sudoku::least_count() const {
    int k = -1, min;
    for (int i = 0; i < _cells.size(); i++) {
-      int m = _cells[i].count();
-      if (m > 1) {
-         if (k == -1 || m < min) {
-            min = m;
-            k = i;
-         }
+      const int m = _cells[i].count();
+      if (m > 1 && (k == -1 || m < min)) {
+         min = m, k = i;
       }
    }
    return k;
diff --git a/sudoku.es.cc b/sudoku.es.cc
index b9910b6..2356ad5 100644
--- a/sudoku.es.cc
+++ b/sudoku.es.cc
@@ -138,12 +138,9 @@ bool Sudoku::elimina(int k, int val) {
 int Sudoku::menos_posibilidades() const {
    int k = -1, min;
    for (int i = 0; i < _celdas.size(); i++) {
-      int m = _celdas[i].num_activos();
-      if (m > 1) {
-         if (k == -1 || m < min) {
-            min = m;
-            k = i;
-         }
+      const int m = _celdas[i].num_activos();
+      if (m > 1 && (k == -1 || m < min)) {
+         min = m, k = i;
       }
    }
    return k;