diff --git a/galvani/__init__.py b/galvani/__init__.py
index 1949033..ce98e1d 100644
--- a/galvani/__init__.py
+++ b/galvani/__init__.py
@@ -1 +1,3 @@
-from .BioLogic import MPTfile, MPRfile
+from .BioLogic import MPRfile, MPTfile
+
+__all__ = ['MPRfile', 'MPTfile']
diff --git a/galvani/res2sqlite.py b/galvani/res2sqlite.py
index 1ad5314..793092a 100755
--- a/galvani/res2sqlite.py
+++ b/galvani/res2sqlite.py
@@ -377,7 +377,7 @@ def mdb_get_data_text(s3db, filename, table):
             s3db.execute(insert_match.group())
             mdb_output = mdb_output[insert_match.end():]
         s3db.commit()
-    except:
+    except BaseException:
         print("Error while importing %s" % table)
         print("Remaining mdb-export output:", mdb_output)
         if insert_match:
@@ -398,8 +398,11 @@ def mdb_get_data_numeric(s3db, filename, table):
         quoted_headers = ['"%s"' % h for h in mdb_headers]
         joined_headers = ', '.join(quoted_headers)
         joined_placemarks = ', '.join(['?' for h in mdb_headers])
-        insert_stmt = 'INSERT INTO "{0}" ({1}) VALUES ({2});'.format(table,
-                                        joined_headers, joined_placemarks)
+        insert_stmt = 'INSERT INTO "{0}" ({1}) VALUES ({2});'.format(
+            table,
+            joined_headers,
+            joined_placemarks,
+        )
         s3db.executemany(insert_stmt, mdb_csv)
         s3db.commit()
     finally:
diff --git a/tests/test_BioLogic.py b/tests/test_BioLogic.py
index c8bf163..7fe2cb6 100644
--- a/tests/test_BioLogic.py
+++ b/tests/test_BioLogic.py
@@ -129,7 +129,7 @@ def assert_MPR_matches_MPT(mpr, mpt, comments):
     assert_array_equal(mpr.get_flag("control changes"), mpt["control changes"])
     if "Ns changes" in mpt.dtype.fields:
         assert_array_equal(mpr.get_flag("Ns changes"), mpt["Ns changes"])
-    ## Nothing uses the 0x40 bit of the flags    
+    # Nothing uses the 0x40 bit of the flags
     assert_array_equal(mpr.get_flag("counter inc."), mpt["counter inc."])
 
     assert_array_almost_equal(mpr.data["time/s"],
@@ -146,10 +146,10 @@ def assert_MPR_matches_MPT(mpr, mpt, comments):
     assert_field_matches("dQ/mA.h", decimal=17)  # 64 bit float precision
     assert_field_matches("P/W", decimal=10)  # 32 bit float precision for 1.xxE-5
     assert_field_matches("I/mA", decimal=6)  # 32 bit float precision
-    
+
     assert_field_exact("cycle number")
     assert_field_matches("(Q-Qo)/C", decimal=6)  # 32 bit float precision
-    
+
     try:
         assert timestamp_from_comments(comments) == mpr.timestamp
     except AttributeError: