diff --git a/pydnmr/dnmrmath.py b/pydnmr/dnmrmath.py
index 135e872..d61af9d 100644
--- a/pydnmr/dnmrmath.py
+++ b/pydnmr/dnmrmath.py
@@ -121,8 +121,7 @@ def two_spin(v, va, vb, ka, wa, wb, pa):
     R = 2 * pi * Dv * (1 + tau * ((1 / T2a) + (1 / T2b)))
     R += pi * dv * tau * ((1 / T2b) - (1 / T2a)) + pi * dv * (pa - pb)
 
-    I = (P * (1 + tau * ((pb / T2a) + (pa / T2b))) + Q * R) / (P ** 2 + R ** 2)
-    return I
+    return (P * (1 + tau * ((pb / T2a) + (pa / T2b))) + Q * R) / (P ** 2 + R ** 2)
 
 
 def d2s_func(va, vb, ka, wa, wb, pa):
@@ -241,5 +240,4 @@ def dnmr_AB(v, v1, v2, J, k, w):
     n2 = r_minus * b_minus - s * a_minus
     d2 = a_minus ** 2 + b_minus ** 2
 
-    I = (n1 / d1) + (n2 / d2)
-    return I
+    return (n1 / d1) + (n2 / d2)
diff --git a/tests/test_main.py b/tests/test_main.py
index 6b3ff4e..76f4bca 100644
--- a/tests/test_main.py
+++ b/tests/test_main.py
@@ -147,16 +147,13 @@ def test_find_two_singlets_widget(self):
     def test_find_two_singlets_layout(self):
 
         foundLayout = self.ui.findChild(QGridLayout, 'twosingletslayout')
-        if foundLayout:
-            print('Found layout named', foundLayout.objectName())
-            print('Found layout has parent:', foundLayout.parent(),
-                  foundLayout.parent().objectName())
-        else:
+        if not foundLayout:
             foundLayout = self.ui.centralWidget().layout()
             print('Did not find QGridLayout child named "twosingletlayout"')
-            print('Found layout named', foundLayout.objectName())
-            print('Found layout has parent:', foundLayout.parent(),
-                  foundLayout.parent().objectName())
+
+        print('Found layout named', foundLayout.objectName())
+        print('Found layout has parent:', foundLayout.parent(),
+              foundLayout.parent().objectName())
 
     def test_find_AB_widget(self):
         foundABWidget = self.ui.findChild(QWidget, 'abwidget')
@@ -361,7 +358,7 @@ def test_twiddle_buttons(self):
 
         for widget in main.ab_vars:
             print(widget.value, 'vs. ', self.widgetdict[widget.key].value())
-            if widget.key == 'k_ab' or widget.key == 'wa':
+            if widget.key in ['k_ab', 'wa']:
                 assert self.widgetdict[widget.key].value() == 20.01
                 # k and wa widgets should not go below 0.01
             elif widget.key == 'j_ab':