diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 1e7e727c..d610e9ba 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -15,7 +15,7 @@ Added
   `#463 <https://github.com/joke2k/django-environ/pull/463>`_.
 - Added variable expansion
   `#468 <https://github.com/joke2k/django-environ/pull/468>`_.
-- Added capability to handle comments after #, after quoted values, like `KEY= 'value_1 # value_2' # comment`
+- Added capability to handle comments after #, after quoted values, like `KEY= 'part1 # part2' # comment`
   `#475 <https://github.com/joke2k/django-environ/pull/475>`_.
 
 Changed
diff --git a/environ/environ.py b/environ/environ.py
index ae2dcfac..ae77de49 100644
--- a/environ/environ.py
+++ b/environ/environ.py
@@ -970,12 +970,14 @@ def _keep_escaped_format_characters(match):
             m1 = re.match(r'\A(?:export )?([A-Za-z_0-9]+)=(.*)\Z', line)
             if m1:
                 key, val = m1.group(1), m1.group(2)
-                # search for value within quotes, ignore comments after # (outside quotes)
+                # search for value within quotes,
+                # ignore comments after # (outside quotes)
                 m2 = re.match(r"\A\s*'(?<!\\)(.*)'\s*(#.*\s*)?\Z", val)
                 if m2:
                     val = m2.group(1)
                 else:
-                    # if no quotes, search for value, ignore comments after first #
+                    # if no quotes, search for value,
+                    # ignore comments after first #
                     m2a = re.match(r"\A(.*?)(#.*\s*)?\Z", val)
                     if m2a:
                         val = m2a.group(1)