diff --git a/qvectorhelper.cpp b/qvectorhelper.cpp
index e40d373..6dda278 100644
--- a/qvectorhelper.cpp
+++ b/qvectorhelper.cpp
@@ -21,14 +21,14 @@ int QVectorHelper::getCurTime(const QVector<int> x) {
 int QVectorHelper::getMinSec1(const QVector<QVector<int>> x) {
     int min = 9999;
     if (x.size() > 0) {
-        if (x.at(0).size() >= 4) {
-            if (x.at(0).at(0) >= minSec1) {
-                min = x.at(0).at(0);
+        for (auto vec : x) {
+            if (vec.size() >= 4) {
+                if (vec.at(0) >= minSec1) {
+                    min = vec.at(0);
+                    break;
+                }
             }
         }
-        else {
-            return 9999;
-        }
     }
     else {
         return 9999;
@@ -48,14 +48,14 @@ int QVectorHelper::getMinSec1(const QVector<QVector<int>> x) {
 int QVectorHelper::getMinSec2(const QVector<QVector<int>> x) {
     int min = 9999;
     if (x.size() > 0) {
-        if (x.at(0).size() >= 3) {
-            if (x.at(0).at(1) >= minSec2) {
-                min = x.at(0).at(1);
+        for (auto vec : x) {
+            if (vec.size() >= 3) {
+                if (vec.at(1) >= minSec2) {
+                    min = vec.at(1);
+                    break;
+                }
             }
         }
-        else {
-            return 9999;
-        }
     }
     else {
         return 9999;
@@ -75,16 +75,17 @@ int QVectorHelper::getMinSec2(const QVector<QVector<int>> x) {
 int QVectorHelper::getMinSec3(const QVector<QVector<int>> x) {
     int min = 9999;
     if (x.size() > 0) {
-        if (x.at(0).size() >= 3) {
-            if (x.at(0).at(2) >= minSec3) {
-                min = x.at(0).at(2);
+        for (auto vec : x) {
+            if (vec.size() >= 3) {
+                if (vec.at(2) >= minSec3) {
+                    min = vec.at(2);
+                    break;
+                }
             }
         }
-        else {
-            return 9999;
-        }
     }
     else {
+        // no times set
         return 9999;
     }
 
@@ -104,12 +105,13 @@ int QVectorHelper::getMin(const QVector<QVector<int>> x) {
     int min = 9999;
     if (x.size() > 0) { // at least one lap is available
 
-        for(auto vec : x){
+        for (auto vec : x) {
             if (vec.size() >= 3) { // check if 3 sectors are available
                 if (getCurTime(x.at(0)) >= minTrackTime &&
                     vec.at(0) > QVectorHelper::minSec1 &&
                     vec.at(1) > QVectorHelper::minSec2 &&
-                    vec.at(2) > QVectorHelper::minSec3) { // check if lap is valid
+                    vec.at(2) >
+                        QVectorHelper::minSec3) { // check if lap is valid
                     min = getCurTime(vec);
                     break;
                 }