diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index f33ff5d1..83a54000 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -14,7 +14,7 @@ to use whatever template makes sense.
 
 #### Problem description
 
-Explain why the current behavior is a problem, what the expected output/behaviour 
+Explain why the current behavior is a problem, what the expected output/behaviour
 is, and why the expected output/behaviour is a better solution.
 
 #### Version and installation information
diff --git a/.github/workflows/ci-osx.yaml b/.github/workflows/ci-osx.yaml
index 1e71d200..3b9d301e 100644
--- a/.github/workflows/ci-osx.yaml
+++ b/.github/workflows/ci-osx.yaml
@@ -58,4 +58,3 @@ jobs:
         run: |
           conda activate env
           pytest -v --pyargs numcodecs
-
diff --git a/LICENSE b/LICENSE
index 5bb4df8c..22c4904c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-
diff --git a/docs/release.rst b/docs/release.rst
index 8520142f..7877d545 100644
--- a/docs/release.rst
+++ b/docs/release.rst
@@ -17,6 +17,9 @@ Maintenance
 * Fix spelling.
   By :user:`Dimitri Papadopoulos Orfanos <DimitriPapadopoulos>`, :issue:`336`.
 
+* Remove trailing spaces and empty lines.
+  By :user:`Dimitri Papadopoulos Orfanos <DimitriPapadopoulos>`, :issue:`341`.
+
 .. _release_0.10.0:
 
 0.10.0
diff --git a/numcodecs/_shuffle.pyx b/numcodecs/_shuffle.pyx
index f8a590c9..308ea491 100644
--- a/numcodecs/_shuffle.pyx
+++ b/numcodecs/_shuffle.pyx
@@ -28,4 +28,3 @@ cpdef void _doUnshuffle(const unsigned char[::1] src, unsigned char[::1] des, Py
         for byte_index in range(count):
             j = byte_index*element_size + i
             des[j] = src[offset+byte_index]
-
diff --git a/numcodecs/blosc.pyx b/numcodecs/blosc.pyx
index 8c645c6d..45e5ea10 100644
--- a/numcodecs/blosc.pyx
+++ b/numcodecs/blosc.pyx
@@ -422,7 +422,7 @@ def decompress_partial(source, start, nitems, dest=None):
     cdef:
         int ret
         int encoding_size
-        int nitems_bytes 
+        int nitems_bytes
         int start_bytes
         char *source_ptr
         char *dest_ptr
@@ -463,7 +463,7 @@ def decompress_partial(source, start, nitems, dest=None):
         if dest_buffer is not None:
             dest_buffer.release()
 
-    # ret refers to the number of bytes returned from blosc_getitem. 
+    # ret refers to the number of bytes returned from blosc_getitem.
     if ret <= 0:
         raise RuntimeError('error during blosc partial decompression: %d', ret)
 
diff --git a/numcodecs/zstd.pyx b/numcodecs/zstd.pyx
index 228291d8..f96be4f4 100644
--- a/numcodecs/zstd.pyx
+++ b/numcodecs/zstd.pyx
@@ -204,7 +204,7 @@ class Zstd(Codec):
     codec_id = 'zstd'
     
     # Note: unlike the LZ4 and Blosc codecs, there does not appear to be a (currently)
-    # practical limit on the size of buffers that Zstd can process and so we don't 
+    # practical limit on the size of buffers that Zstd can process and so we don't
     # enforce a max_buffer_size option here.
 
     def __init__(self, level=DEFAULT_CLEVEL):
diff --git a/pytest.ini b/pytest.ini
index d588d41a..10f311e9 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,3 +1,2 @@
 [pytest]
 doctest_optionflags = NORMALIZE_WHITESPACE ELLIPSIS IGNORE_EXCEPTION_DETAIL
-