diff --git a/d2o_config b/d2o_config
index 3fb18a2ede1b45c5e1b281158b66fa7d8ae8684a..78081536c16ecefcbc866f93a2b82394e922e612 100644
--- a/d2o_config
+++ b/d2o_config
@@ -1,6 +1,6 @@
 [DEFAULT]
 mpi_module = MPI
-mpi_init_checks = True
+mpi_init_checks = False
 default_distribution_strategy = fftw
 default_comm = COMM_WORLD
 
diff --git a/setup.py b/setup.py
index 04f7e29ebbb7a4cff1a7cb8e97b383f70ef162f8..5f0848008509b5ed73fde108cd37e3adff604fb8 100644
--- a/setup.py
+++ b/setup.py
@@ -36,20 +36,18 @@ setup(name="ift_nifty",
                 "nifty.operators", "nifty.dummys", "nifty.config"],
       package_dir={"nifty": ""},
       zip_safe=False,
-      dependency_links = [
+      dependency_links=[
         'git+https://gitlab.mpcdf.mpg.de/ift/keepers.git#egg=keepers',
         'git+https://gitlab.mpcdf.mpg.de/ift/d2o.git#egg=d2o'],
-      install_requires = ['keepers', 'd2o'],
+      install_requires=['keepers', 'd2o'],
       data_files=[(os.path.expanduser('~') + "/.nifty",
                    ['nifty_config', 'd2o_config'])],
-      package_data={'nifty.demos' : ['demo_faraday_map.npy'],
+      package_data={'nifty.demos': ['demo_faraday_map.npy'],
                     },
       license="GPLv3",
       classifiers=[
         "Development Status :: 4 - Beta",
         "Topic :: Utilities",
-"License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
-    ],)
-
-
-
+        "License :: OSI Approved :: GNU General Public License v3 "
+        "or later (GPLv3+)"],
+      )