diff --git a/neo/io/__init__.py b/neo/io/__init__.py
index de2153dbd..f3b589695 100644
--- a/neo/io/__init__.py
+++ b/neo/io/__init__.py
@@ -167,7 +167,7 @@
 .. autoclass:: neo.io.MaxwellIO
 
     .. autoattribute:: extensions
-    
+
 .. autoclass:: neo.io.MedIO
 
     .. autoattribute:: extensions
diff --git a/neo/rawio/axonrawio.py b/neo/rawio/axonrawio.py
index 7efa824e1..b51978af8 100644
--- a/neo/rawio/axonrawio.py
+++ b/neo/rawio/axonrawio.py
@@ -23,7 +23,7 @@
 strings section:
 [uModifierNameIndex, uCreatorNameIndex, uProtocolPathIndex, lFileComment, lADCCChannelNames, lADCUnitsIndex
 lDACChannelNameIndex, lDACUnitIndex, lDACFilePath, nLeakSubtractADC]
-['', 'Clampex', '', 'C:/path/protocol.pro', 'some comment', 'IN 0', 'mV', 'IN 1', 'mV', 'Cmd 0', 'pA', 
+['', 'Clampex', '', 'C:/path/protocol.pro', 'some comment', 'IN 0', 'mV', 'IN 1', 'mV', 'Cmd 0', 'pA',
 'Cmd 1', 'pA', 'Cmd 2', 'mV', 'Cmd 3', 'mV']
 
 Information on abf 1 and 2 formats is available here:
diff --git a/neo/rawio/intanrawio.py b/neo/rawio/intanrawio.py
index 151f7fe6f..e7d668f14 100644
--- a/neo/rawio/intanrawio.py
+++ b/neo/rawio/intanrawio.py
@@ -16,7 +16,7 @@
   * http://intantech.com/files/Intan_RHD2000_data_file_formats.pdf
   * http://intantech.com/files/Intan_RHS2000_data_file_formats.pdf
 
-  
+
 Author: Samuel Garcia (Initial), Zach McKenzie & Heberto Mayorquin (Updates)
 
 """
diff --git a/neo/rawio/medrawio.py b/neo/rawio/medrawio.py
index 5d792618e..d66f0c8d5 100644
--- a/neo/rawio/medrawio.py
+++ b/neo/rawio/medrawio.py
@@ -1,6 +1,6 @@
 """
 Class for reading MED (Multiscale Electrophysiology Data) Format.
-    
+
 Uses the dhn-med-py python package, created by Dark Horse Neuro, Inc.
 
 Authors: Dan Crepeau, Matt Stead
diff --git a/neo/rawio/neuronexusrawio.py b/neo/rawio/neuronexusrawio.py
index 2c599eb4c..7de7ac638 100644
--- a/neo/rawio/neuronexusrawio.py
+++ b/neo/rawio/neuronexusrawio.py
@@ -6,13 +6,13 @@
   * The *.xdat.json metadata file
   * The *_data.xdat binary file of all raw data
   * The *_timestamps.xdat binary file of the timestamp data
-  
+
 Based on sample data is appears that the binary file is always a float32 format
 Other information can be found within the metadata json file
 
 
 The metadata file has a pretty complicated structure as far as I can tell
-a lot of which is dedicated to probe information, which won't be handle at the 
+a lot of which is dedicated to probe information, which won't be handle at the
 the Neo level.
 
 It appears that the metadata['status'] provides most of the information necessary
diff --git a/neo/test/iotest/test_openephysbinaryio.py b/neo/test/iotest/test_openephysbinaryio.py
index 5d377362b..1ef32eb40 100644
--- a/neo/test/iotest/test_openephysbinaryio.py
+++ b/neo/test/iotest/test_openephysbinaryio.py
@@ -1,6 +1,4 @@
-"""
-
-"""
+""" """
 
 import unittest
 
diff --git a/neo/test/iotest/test_openephysio.py b/neo/test/iotest/test_openephysio.py
index 12c7023e1..fd9a79e82 100644
--- a/neo/test/iotest/test_openephysio.py
+++ b/neo/test/iotest/test_openephysio.py
@@ -1,6 +1,4 @@
-"""
-
-"""
+""" """
 
 import unittest
 
diff --git a/neo/test/rawiotest/test_brainvisionrawio.py b/neo/test/rawiotest/test_brainvisionrawio.py
index 83be1e8a7..b582b4103 100644
--- a/neo/test/rawiotest/test_brainvisionrawio.py
+++ b/neo/test/rawiotest/test_brainvisionrawio.py
@@ -1,6 +1,4 @@
-"""
-
-"""
+""" """
 
 import unittest
 
diff --git a/neo/test/rawiotest/test_micromedrawio.py b/neo/test/rawiotest/test_micromedrawio.py
index 8f610c584..1c8262860 100644
--- a/neo/test/rawiotest/test_micromedrawio.py
+++ b/neo/test/rawiotest/test_micromedrawio.py
@@ -1,6 +1,4 @@
-"""
-
-"""
+""" """
 
 import unittest