diff --git a/postpic/__init__.py b/postpic/__init__.py
index 93f9e9eb..27d848ba 100644
--- a/postpic/__init__.py
+++ b/postpic/__init__.py
@@ -26,18 +26,16 @@
 import datareader
 import analyzer
 import plotting
+from pkg_resources import get_distribution, DistributionNotFound
+from analyzer import ParticleAnalyzer, identifyspecies
+from datareader import chooseCode, readDump, readSim
 
 __all__ = ['datareader', 'analyzer', 'plotting']
-
 # high level functions
-from analyzer import ParticleAnalyzer, identifyspecies
 __all__ += ['ParticleAnalyzer', 'identifyspecies']
-
-from datareader import chooseCode, readDump, readSim
 __all__ += ['chooseCode', 'readDump', 'readSim']
 
 # read version from installed metadata
-from pkg_resources import get_distribution, DistributionNotFound
 try:
     import os.path
     _dist = get_distribution('postpic')
diff --git a/postpic/analyzer/fields.py b/postpic/analyzer/fields.py
index 4e8bddf3..51755b85 100644
--- a/postpic/analyzer/fields.py
+++ b/postpic/analyzer/fields.py
@@ -19,12 +19,12 @@
 Field related routines.
 """
 
-__all__ = ['FieldAnalyzer']
-
 import numpy as np
 from analyzer import PhysicalConstants as pc
 from ..datahandling import *
 
+__all__ = ['FieldAnalyzer']
+
 
 class FieldAnalyzer(object):
     '''
diff --git a/postpic/analyzer/particles.py b/postpic/analyzer/particles.py
index e959e804..e43b4933 100644
--- a/postpic/analyzer/particles.py
+++ b/postpic/analyzer/particles.py
@@ -19,8 +19,6 @@
 Particle related routines.
 """
 
-__all__ = ['ParticleAnalyzer']
-
 import numpy as np
 from analyzer import PhysicalConstants as pc
 import analyzer
@@ -28,6 +26,8 @@
 
 identifyspecies = analyzer.SpeciesIdentifier.identifyspecies
 
+__all__ = ['ParticleAnalyzer', 'identifyspecies']
+
 
 class _SingleSpeciesAnalyzer(object):
     """