diff --git a/app/src/main/java/de/sopa/helper/LevelSolver.java b/app/src/main/java/de/sopa/helper/LevelSolver.java
index bfee66b5..11d0389b 100644
--- a/app/src/main/java/de/sopa/helper/LevelSolver.java
+++ b/app/src/main/java/de/sopa/helper/LevelSolver.java
@@ -70,16 +70,16 @@ private boolean solve(Level level, int maxDepth, int currentDepth, List<Level> p
             for (int column = 0; column < columns - 2; column++) {
                 gameFieldService.shiftLine(level, false, column, 1);
 
-                if (currentDepth + 1 < highestHit && solve(level, maxDepth, currentDepth + 1, possibleSolutions)) {
-                    if (currentDepth + 1 < highestHit)
-                        return true;
+                if (currentDepth + 1 < highestHit && solve(level, maxDepth, currentDepth + 1, possibleSolutions)
+                        && currentDepth + 1 < highestHit) {
+                    return true;
                 }
 
                 gameFieldService.shiftLine(level, false, column, -2);
 
-                if (currentDepth + 1 < highestHit && solve(level, maxDepth, currentDepth + 1, possibleSolutions)) {
-                    if (currentDepth + 1 < highestHit)
-                        return true;
+                if (currentDepth + 1 < highestHit && solve(level, maxDepth, currentDepth + 1, possibleSolutions)
+                        && currentDepth + 1 < highestHit) {
+                    return true;
                 }
 
                 // restore state
@@ -89,16 +89,16 @@ private boolean solve(Level level, int maxDepth, int currentDepth, List<Level> p
             for (int row = 0; row < rows - 2; row++) {
                 gameFieldService.shiftLine(level, true, row, 1);
 
-                if (currentDepth + 1 < highestHit && solve(level, maxDepth, currentDepth + 1, possibleSolutions)) {
-                    if (currentDepth + 1 < highestHit)
-                        return true;
+                if (currentDepth + 1 < highestHit && solve(level, maxDepth, currentDepth + 1, possibleSolutions)
+                        && currentDepth + 1 < highestHit) {
+                    return true;
                 }
 
                 gameFieldService.shiftLine(level, true, row, -2);
 
-                if (currentDepth + 1 < highestHit && solve(level, maxDepth, currentDepth + 1, possibleSolutions)) {
-                    if (currentDepth + 1 < highestHit)
-                        return true;
+                if (currentDepth + 1 < highestHit && solve(level, maxDepth, currentDepth + 1, possibleSolutions)
+                        && currentDepth + 1 < highestHit) {
+                    return true;
                 }
 
                 // restore state