diff --git a/README.md b/README.md
index 99da6ae71b5e02c424a984bb83a9a1d8b5cbab84..d2ef2a8f5d80a9a840aa5719f2f020acbbb3299a 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 NIFTy - Numerical Information Field Theory
 ==========================================
-[![build status](https://gitlab.mpcdf.mpg.de/ift/NIFTy/badges/NIFTy_5/build.svg)](https://gitlab.mpcdf.mpg.de/ift/NIFTy/commits/NIFTy_5)
-[![coverage report](https://gitlab.mpcdf.mpg.de/ift/NIFTy/badges/NIFTy_5/coverage.svg)](https://gitlab.mpcdf.mpg.de/ift/NIFTy/commits/NIFTy_5)
+[![build status](https://gitlab.mpcdf.mpg.de/ift/nifty-dev/badges/NIFTy_5/build.svg)](https://gitlab.mpcdf.mpg.de/ift/nifty-dev/commits/NIFTy_5)
+[![coverage report](https://gitlab.mpcdf.mpg.de/ift/nifty-dev/badges/NIFTy_5/coverage.svg)](https://gitlab.mpcdf.mpg.de/ift/nifty-dev/commits/NIFTy_5)
 
 **NIFTy** project homepage:
 [http://ift.pages.mpcdf.de/NIFTy](http://ift.pages.mpcdf.de/NIFTy)
diff --git a/nifty5/__init__.py b/nifty5/__init__.py
index a32e88f4fbff601202a0f423b4328dc4c95aad46..6933bd27908fd5e1010ed130fb2fcef194cf20bf 100644
--- a/nifty5/__init__.py
+++ b/nifty5/__init__.py
@@ -21,7 +21,7 @@ from .nonlinearities import Exponential, Linear, PositiveTanh, Tanh
 from .models.constant import Constant
 from .models.linear_model import LinearModel
 from .models.local_nonlinearity import (LocalModel, PointwiseExponential,
-                                 PointwisePositiveTanh, PointwiseTanh)
+                                        PointwisePositiveTanh, PointwiseTanh)
 from .models.model import Model
 from .models.multi_model import MultiModel
 from .models.variable import Variable
@@ -65,7 +65,8 @@ from .minimization.steepest_descent import SteepestDescent
 from .minimization.vl_bfgs import VL_BFGS
 from .minimization.l_bfgs import L_BFGS
 from .minimization.relaxed_newton import RelaxedNewton
-from .minimization.scipy_minimizer import ScipyMinimizer, NewtonCG, L_BFGS_B, ScipyCG
+from .minimization.scipy_minimizer import (ScipyMinimizer, NewtonCG, L_BFGS_B,
+                                           ScipyCG)
 from .minimization.energy import Energy
 from .minimization.quadratic_energy import QuadraticEnergy
 from .minimization.line_energy import LineEnergy
@@ -82,7 +83,8 @@ from .library.point_sources import PointSources
 from .library.poissonian_energy import PoissonianEnergy
 from .library.wiener_filter_curvature import WienerFilterCurvature
 from .library.wiener_filter_energy import WienerFilterEnergy
-from .library.correlated_fields import make_correlated_field, make_mf_correlated_field
+from .library.correlated_fields import (make_correlated_field,
+                                        make_mf_correlated_field)
 
 from . import extra
 
diff --git a/nifty5/energies/kl.py b/nifty5/energies/kl.py
index 0289b70c0164b19b93945dcecfdad1d71ae28a18..4a1e9012674cec0c8531ce17550d1e0bf3d3c28e 100644
--- a/nifty5/energies/kl.py
+++ b/nifty5/energies/kl.py
@@ -34,5 +34,5 @@ class SampledKullbachLeiblerDivergence(Energy):
     @property
     @memo
     def curvature(self):
-       return (my_sum(map(lambda v: v.curvature, self._energy_list)) *
-               (1./len(self._energy_list)))
+        return (my_sum(map(lambda v: v.curvature, self._energy_list)) *
+                (1./len(self._energy_list)))
diff --git a/nifty5/library/correlated_fields.py b/nifty5/library/correlated_fields.py
index 4a3aaa490f90abc4a9b57840b6ac45249ad1f643..a6f6439254c54729e22839a34007d51ae1728950 100644
--- a/nifty5/library/correlated_fields.py
+++ b/nifty5/library/correlated_fields.py
@@ -47,7 +47,8 @@ def make_mf_correlated_field(s_space_spatial, s_space_energy,
     from ..models.variable import Variable
     from ..domain_tuple import DomainTuple
     from ..operators.domain_distributor import DomainDistributor
-    from ..operators.harmonic_transform_operator import HarmonicTransformOperator
+    from ..operators.harmonic_transform_operator \
+        import HarmonicTransformOperator
     h_space_spatial = s_space_spatial.get_default_codomain()
     h_space_energy = s_space_energy.get_default_codomain()
     h_space = DomainTuple.make((h_space_spatial, h_space_energy))
diff --git a/nifty5/library/point_sources.py b/nifty5/library/point_sources.py
index 1bb69c3ee1b2415631f8a4ff8e050c8384f5becc..3c577d77492ebb16421231b10f90d5794e990d2a 100644
--- a/nifty5/library/point_sources.py
+++ b/nifty5/library/point_sources.py
@@ -51,7 +51,8 @@ class PointSources(Model):
     @staticmethod
     def IG_prime(field, alpha, q):
         inner = norm.pdf(field.local_data)
-        outer = invgamma.pdf(invgamma.ppf(norm.cdf(field.local_data), alpha, scale=q), alpha, scale=q)
+        outer = invgamma.pdf(invgamma.ppf(norm.cdf(field.local_data), alpha,
+                                          scale=q), alpha, scale=q)
         # # FIXME
         # outer = np.clip(outer, 1e-20, None)
         outer = 1/outer
diff --git a/nifty5/operators/chain_operator.py b/nifty5/operators/chain_operator.py
index 49edcd898556cc8631a9e1e2c0726160231d6512..91c7091d76eb48477a9af72646024d4b30aae7a3 100644
--- a/nifty5/operators/chain_operator.py
+++ b/nifty5/operators/chain_operator.py
@@ -94,9 +94,8 @@ class ChainOperator(LinearOperator):
 
     @staticmethod
     def make(ops):
-        """Build a ChainOperator (or something simpler if possible), 
+        """Build a ChainOperator (or something simpler if possible),
         a sequence of concatenated LinearOperators.
-        
 
         Parameters
         ----------
diff --git a/nifty5/operators/linear_operator.py b/nifty5/operators/linear_operator.py
index 988cfbddbbd7172202ca9e7787726ff88ea2a33b..d6f74fc0e7831430b92d8f277bcbda3ecb2de06a 100644
--- a/nifty5/operators/linear_operator.py
+++ b/nifty5/operators/linear_operator.py
@@ -277,7 +277,8 @@ class LinearOperator(NiftyMetaBase()):
         if not self._validMode[mode]:
             raise NotImplementedError("invalid operator mode specified")
         if mode & self.capability == 0:
-            raise NotImplementedError("requested operator mode is not supported")
+            raise NotImplementedError(
+                "requested operator mode is not supported")
 
     def _check_input(self, x, mode):
         self._check_mode(mode)