From c3edfd5d888ff55c517738f0752ae292da841682 Mon Sep 17 00:00:00 2001
From: Hayden Jackson <hayden.adam.jackson@gmail.com>
Date: Fri, 5 May 2017 12:33:47 +1200
Subject: [PATCH 01/11] Bug fix to add all terms to the glossary.

---
 verto/processors/GlossaryLinkPattern.py |  3 ++-
 verto/tests/ConfigurationTest.py        | 17 +++++++++-------
 verto/tests/GlossaryLinkTest.py         | 27 +++++++++++++++++++------
 3 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/verto/processors/GlossaryLinkPattern.py b/verto/processors/GlossaryLinkPattern.py
index b9b25b56..502a6327 100644
--- a/verto/processors/GlossaryLinkPattern.py
+++ b/verto/processors/GlossaryLinkPattern.py
@@ -51,9 +51,10 @@ def handleMatch(self, match):
             'text': text
         }
 
+        glossary_reference = self.ext_glossary_terms[term]
         if reference is not None:
             identifier = self.unique_slugify('glossary-' + term)
-            self.ext_glossary_terms[term].append((reference, identifier))
+            glossary_reference.append((reference, identifier))
             context['id'] = identifier
 
         html_string = self.template.render(context)
diff --git a/verto/tests/ConfigurationTest.py b/verto/tests/ConfigurationTest.py
index 8d26a457..f4405d2f 100644
--- a/verto/tests/ConfigurationTest.py
+++ b/verto/tests/ConfigurationTest.py
@@ -64,7 +64,9 @@ def test_multiple_calls(self):
                             children=()
                         ),
                     ),
-                    required_glossary_terms=defaultdict(list)
+                    required_glossary_terms={
+                        'algorithm': []
+                    }
                 )
             ),
             ('some_processors.md',
@@ -116,6 +118,7 @@ def test_multiple_calls(self):
                         children=(),
                     ),),
                     required_glossary_terms={
+                        'hello': [],
                         'algorithm':
                             [('computer program', 'glossary-algorithm'),
                              ('algorithm cost', 'glossary-algorithm-2'),
@@ -126,15 +129,15 @@ def test_multiple_calls(self):
             )
         ]
 
-        for test in test_cases:
+        for filename, expected_result in test_cases:
             verto = Verto()
-            test_string = self.read_test_file(self.test_name, test[0])
+            test_string = self.read_test_file(self.test_name, filename)
             verto_result = verto.convert(test_string)
 
-            self.assertEqual(verto_result.title, test[1].title)
-            self.assertEqual(verto_result.required_files, test[1].required_files)
-            self.assertTupleEqual(verto_result.heading_tree, test[1].heading_tree)
-            self.assertDictEqual(verto_result.required_glossary_terms, test[1].required_glossary_terms)
+            self.assertEqual(verto_result.title, expected_result.title)
+            self.assertEqual(verto_result.required_files, expected_result.required_files)
+            self.assertTupleEqual(verto_result.heading_tree, expected_result.heading_tree)
+            self.assertDictEqual(verto_result.required_glossary_terms, expected_result.required_glossary_terms)
 
     def test_custom_processors_and_custom_templates_on_creation(self):
         '''Checks if custom processors and custom templates work
diff --git a/verto/tests/GlossaryLinkTest.py b/verto/tests/GlossaryLinkTest.py
index f019f5d6..c1a92672 100644
--- a/verto/tests/GlossaryLinkTest.py
+++ b/verto/tests/GlossaryLinkTest.py
@@ -35,7 +35,9 @@ def test_single_word_term(self):
         self.assertEqual(expected_string, converted_test_string)
 
         glossary_terms = self.verto_extension.glossary_terms
-        expected_glossary_terms = dict()
+        expected_glossary_terms = {
+            'quicksort': []
+        }
         self.assertDictEqual(expected_glossary_terms, glossary_terms)
 
     def test_multiple_word_term(self):
@@ -51,7 +53,9 @@ def test_multiple_word_term(self):
         self.assertEqual(expected_string, converted_test_string)
 
         glossary_terms = self.verto_extension.glossary_terms
-        expected_glossary_terms = dict()
+        expected_glossary_terms = {
+            'digital-signature': []
+        }
         self.assertDictEqual(expected_glossary_terms, glossary_terms)
 
     def test_reference_text_given(self):
@@ -88,7 +92,9 @@ def test_leading_inline_text(self):
         self.assertEqual(expected_string, converted_test_string)
 
         glossary_terms = self.verto_extension.glossary_terms
-        expected_glossary_terms = dict()
+        expected_glossary_terms = {
+            'grammar': []
+        }
         self.assertDictEqual(expected_glossary_terms, glossary_terms)
 
     def test_trailing_inline_text(self):
@@ -105,7 +111,9 @@ def test_trailing_inline_text(self):
         self.assertEqual(expected_string, converted_test_string)
 
         glossary_terms = self.verto_extension.glossary_terms
-        expected_glossary_terms = dict()
+        expected_glossary_terms = {
+            'finite state automaton': []
+        }
         self.assertDictEqual(expected_glossary_terms, glossary_terms)
 
     def test_leading_and_trailing_inline_text(self):
@@ -122,7 +130,9 @@ def test_leading_and_trailing_inline_text(self):
         self.assertEqual(expected_string, converted_test_string)
 
         glossary_terms = self.verto_extension.glossary_terms
-        expected_glossary_terms = dict()
+        expected_glossary_terms = {
+            'Regular expression': []
+        }
         self.assertDictEqual(expected_glossary_terms, glossary_terms)
 
     def test_multiple_terms(self):
@@ -141,6 +151,8 @@ def test_multiple_terms(self):
 
         glossary_terms = self.verto_extension.glossary_terms
         expected_glossary_terms = {
+            'grammar': [],
+            'regular-expression': [],
             'finite-state-automaton':
                 [('Formal languages', 'glossary-finite-state-automaton')]
         }
@@ -162,6 +174,7 @@ def test_multiple_reference_text(self):
 
         glossary_terms = self.verto_extension.glossary_terms
         expected_glossary_terms = {
+            'hello': [],
             'algorithm':
                 [('computer program', 'glossary-algorithm'),
                  ('algorithm cost', 'glossary-algorithm-2'),
@@ -187,7 +200,9 @@ def test_doc_example_basic(self):
         self.assertEqual(expected_string, converted_test_string)
 
         glossary_terms = self.verto_extension.glossary_terms
-        expected_glossary_terms = dict()
+        expected_glossary_terms = {
+            'algorithm': []
+        }
         self.assertDictEqual(expected_glossary_terms, glossary_terms)
 
     def test_doc_example_override_html(self):

From 497b0edfbd9e0440ea919419d121e1d6694798fb Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 5 May 2017 12:34:11 +1200
Subject: [PATCH 02/11] Update python-slugify from 1.2.3 to 1.2.4

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 227fc913..41beef12 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@
 markdown==2.6.8
 beautifulsoup4==4.5.3
 Jinja2==2.9.6
-python-slugify==1.2.3
+python-slugify==1.2.4
 setuptools==35.0.2
 
 # Required dependencies for building documentation

From d723038012746dccf4bf3a3f59f32ed270b474a7 Mon Sep 17 00:00:00 2001
From: Hayden Jackson <hayden.adam.jackson@gmail.com>
Date: Fri, 5 May 2017 13:23:11 +1200
Subject: [PATCH 03/11] Update setup.py requirements.

---
 setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index b7a1485a..875892ac 100644
--- a/setup.py
+++ b/setup.py
@@ -31,8 +31,8 @@
     include_package_data=True,
     install_requires=[
         'markdown>=2.6.8',
-        'beautifulsoup4==4.5.3',
+        'beautifulsoup4>=4.5.3',
         'Jinja2>=2.9.6',
-        'python-slugify>=1.2.2'
+        'python-slugify>=1.2.4'
     ]
 )

From 1b9b3ea996bf17f21ee2c0a7bc936d3806800c0e Mon Sep 17 00:00:00 2001
From: Hayden Jackson <hayden.adam.jackson@gmail.com>
Date: Fri, 5 May 2017 13:42:21 +1200
Subject: [PATCH 04/11] Clear uniques only when requested, while per document
 data cleared on each run.

---
 verto/Verto.py          | 8 +++++++-
 verto/VertoExtension.py | 8 ++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/verto/Verto.py b/verto/Verto.py
index 35be2f0d..341c0e03 100644
--- a/verto/Verto.py
+++ b/verto/Verto.py
@@ -66,7 +66,7 @@ def convert(self, text):
         Returns:
             A VertoResult object.
         '''
-        self.verto_extension.clear_saved_data()
+        self.verto_extension.clear_document_data()
         html_string = self.converter.convert(text)
         result = VertoResult(
             html_string=html_string,
@@ -77,6 +77,12 @@ def convert(self, text):
         )
         return result
 
+    def clear_saved_data(self):
+        '''Wrapped for clearing the saved data of the verto
+        extension.
+        '''
+        self.verto_extension.clear_saved_data()
+
     def update_templates(self, html_templates):
         '''Update the template dictionary with the given dictionary
         of templates, while leaving all other HTML templates (including
diff --git a/verto/VertoExtension.py b/verto/VertoExtension.py
index cff7098d..4106835e 100644
--- a/verto/VertoExtension.py
+++ b/verto/VertoExtension.py
@@ -116,13 +116,17 @@ def update_processors(processors, markdown_processors):
                 processor = ScratchCompatibilityPreprocessor(self, md)
                 md.preprocessors.add('scratch-compatibility', processor, '<fenced_code_block')
 
+    def clear_document_data(self):
+        '''Clears information stored for a specific document.
+        '''
+        self.title = None
+        self.heading_tree = None
+
     def clear_saved_data(self):
         '''Clears stored information from processors, should be called
         between runs.
         '''
-        self.title = None
         self.custom_slugify.clear()
-        self.heading_tree = None
         for key in self.required_files.keys():
             self.required_files[key].clear()
 

From 39398164debdb0b6762b9765c3d7266ef00614d0 Mon Sep 17 00:00:00 2001
From: Hayden Jackson <hayden.adam.jackson@gmail.com>
Date: Fri, 5 May 2017 13:54:43 +1200
Subject: [PATCH 05/11] Update documentation for clearing saved data and the
 verto result definition.

---
 docs/source/usage.rst   | 19 ++++++++++++++++++-
 verto/Verto.py          |  4 ++--
 verto/VertoExtension.py |  2 +-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/docs/source/usage.rst b/docs/source/usage.rst
index a6fdcbda..b6ae536b 100644
--- a/docs/source/usage.rst
+++ b/docs/source/usage.rst
@@ -116,6 +116,15 @@ The following attributes are available:
           []
       }
 
+(Optional) Step 5: Clearing Saved Data
+=======================================
+
+Lastly there is some data that is saved between conversions such as ``required_files`` and unique ids used in the ``glossary`` and for ``headings``. This can be cleared by using the following method:
+
+  .. code-block:: python
+
+    converter.clear_saved_data()
+
 Configuring Verto converter after creation
 ===============================================
 
@@ -155,7 +164,7 @@ Full list of package methods
 =======================================
 
 .. autoclass:: verto.Verto()
-  :members: __init__, convert, update_processors, processor_defaults, update_templates, clear_templates
+  :members: __init__, convert, update_processors, processor_defaults, update_templates, clear_templates, clear_saved_data
 
 .. autoclass:: verto.Verto.VertoResult()
 
@@ -170,3 +179,11 @@ Full list of package methods
   .. attribute:: required_files
 
     A dictionary of files encountered in a Verto conversion. The dictionary has a string for the file type as the key (for example: ``image``) and a set of all file paths encountered as the value (for example: ``{'image/face.png', 'image/logo.png`}``).
+
+  .. attribute:: heading_tree
+
+     A tuple of namedtuples which describes the tree of headings, as generated by our heading processor. Each namedtuple contains a title (string), title_slug (string), level (integer) and children (tuple of nodes).
+
+  .. attribute:: required_glossary_terms
+
+     A dictionary of terms to a list of tuples containing reference text and link IDs.
diff --git a/verto/Verto.py b/verto/Verto.py
index 341c0e03..1da65fb3 100644
--- a/verto/Verto.py
+++ b/verto/Verto.py
@@ -78,8 +78,8 @@ def convert(self, text):
         return result
 
     def clear_saved_data(self):
-        '''Wrapped for clearing the saved data of the verto
-        extension.
+        '''Clears data that is saved between documents. This should be
+        called between conversions on unrelated documents. 
         '''
         self.verto_extension.clear_saved_data()
 
diff --git a/verto/VertoExtension.py b/verto/VertoExtension.py
index 4106835e..95e6a1b1 100644
--- a/verto/VertoExtension.py
+++ b/verto/VertoExtension.py
@@ -124,7 +124,7 @@ def clear_document_data(self):
 
     def clear_saved_data(self):
         '''Clears stored information from processors, should be called
-        between runs.
+        between runs on unrelated documents.
         '''
         self.custom_slugify.clear()
         for key in self.required_files.keys():

From f55342d29757cd84eabce03427499f5af5a19fc2 Mon Sep 17 00:00:00 2001
From: Hayden Jackson <hayden.adam.jackson@gmail.com>
Date: Fri, 5 May 2017 13:57:38 +1200
Subject: [PATCH 06/11] flake8 fix

---
 verto/Verto.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/verto/Verto.py b/verto/Verto.py
index 1da65fb3..3cc5aa62 100644
--- a/verto/Verto.py
+++ b/verto/Verto.py
@@ -79,7 +79,7 @@ def convert(self, text):
 
     def clear_saved_data(self):
         '''Clears data that is saved between documents. This should be
-        called between conversions on unrelated documents. 
+        called between conversions on unrelated documents.
         '''
         self.verto_extension.clear_saved_data()
 

From a235f8ab6ccde9f4d983ebc662ca60f306dfda39 Mon Sep 17 00:00:00 2001
From: Hayden Jackson <hayden.adam.jackson@gmail.com>
Date: Fri, 5 May 2017 18:54:38 +1200
Subject: [PATCH 07/11] Remove beautify processor and update tests.

---
 docs/source/processors/beautify.rst           |  31 -----
 verto/VertoExtension.py                       |   2 -
 verto/html-templates/boxed-text.html          |   2 +-
 verto/html-templates/glossary-link.html       |   4 +-
 verto/html-templates/heading.html             |  44 +++----
 verto/html-templates/iframe.html              |   4 +-
 verto/html-templates/image.html               |  24 ++--
 verto/html-templates/interactive.html         |  36 +++---
 verto/html-templates/panel.html               |  16 +--
 verto/html-templates/relative-link.html       |   4 +-
 verto/html-templates/scratch.html             |   8 +-
 verto/html-templates/table-of-contents.html   |   2 +-
 verto/html-templates/video.html               |   2 +-
 verto/processors/BeautifyPostprocessor.py     |  86 --------------
 .../GenericContainerBlockProcessor.py         |   1 +
 verto/tests/BeautifyTest.py                   |  62 ----------
 verto/tests/ConfigurationTest.py              |  34 +++---
 verto/tests/VideoTest.py                      |  11 ++
 .../doc_example_basic_usage_expected.html     |  10 +-
 .../doc_example_override_html_expected.html   |   8 +-
 .../doc_example_override_html_template.html   |   6 +-
 .../indented_boxed_text_expected.html         |   4 +-
 .../multiple_boxed_text_expected.html         |  16 +--
 .../boxed-text/no_boxed_text_expected.html    |  16 +--
 .../recursive_boxed_text_expected.html        |  16 +--
 .../single_boxed_text_expected.html           |   8 +-
 .../button-link/contains_button_expected.html |  19 +---
 .../contains_file_link_button_expected.html   |  23 +---
 .../contains_multiple_buttons_expected.html   |  45 ++------
 .../doc_example_basic_usage_expected.html     |   4 +-
 .../doc_example_file_usage_expected.html      |   4 +-
 .../doc_example_override_html_expected.html   |   4 +-
 .../missing_end_brace_expected.html           |  12 +-
 .../button-link/no_button_expected.html       |  36 ++----
 .../comment_contains_comment_expected.html    |   4 +-
 ...mment_within_block_container_expected.html |  16 +--
 ...ins_multiple_inline_comments_expected.html |   4 +-
 .../doc_example_multiple_usage_expected.html  |  12 +-
 .../comment/no_inline_comment_expected.html   |  10 +-
 ...xt_contains_the_word_comment_expected.html |  20 +---
 .../doc_example_basic_usage_expected.html     |   4 +-
 .../doc_example_complex_usage_expected.html   |  16 +--
 .../doc_example_override_html_expected.html   |  12 +-
 .../example_basic_else_usage_expected.html    |   8 +-
 .../example_elif_no_else_expected.html        |   2 +-
 .../example_single_elif_expected.html         |   8 +-
 .../all_processors_custom_html_expected.html  |  93 +++++----------
 ...ll_processors_except_comment_expected.html | 106 +++++------------
 .../all_processors_expected.html              | 102 +++++------------
 ..._processors_custom_templates_expected.html |  85 ++++----------
 .../custom_processors_expected.html           | 107 +++++-------------
 .../multiline_templates_expected.html         |  96 +++++-----------
 .../some_processors_2_expected.html           |  76 ++++---------
 .../some_processors_expected.html             |  29 ++---
 .../doc_example_basic_usage_expected.html     |   8 +-
 .../doc_example_override_html_expected.html   |   8 +-
 .../doc_example_override_html_template.html   |   4 +-
 ...ing_and_trailing_inline_text_expected.html |  14 +--
 .../leading_inline_text_expected.html         |  12 +-
 .../glossary-link/multiple_reference_text.md  |   4 +-
 .../multiple_reference_text_expected.html     |  49 ++------
 .../assets/glossary-link/multiple_terms.md    |   9 +-
 .../multiple_terms_expected.html              |  20 +---
 .../multiple_word_term_expected.html          |  11 +-
 .../reference_text_given_expected.html        |   6 +-
 .../single_word_term_expected.html            |   8 +-
 .../trailing_inline_text_expected.html        |   9 +-
 .../doc_example_basic_usage_expected.html     |  24 ++--
 .../doc_example_override_html_expected.html   |  56 ++++-----
 .../doc_example_override_html_template.html   |   8 +-
 .../example_single_heading_expected.html      |   8 +-
 .../multiple_roots_zero_level_expected.html   |  56 ++++-----
 .../doc_example_basic_usage_expected.html     |   4 +-
 .../doc_example_override_html_template.html   |   3 +-
 .../assets/image/align_center_expected.html   |   2 +-
 .../assets/image/align_left_expected.html     |   2 +-
 .../assets/image/align_right_expected.html    |   2 +-
 .../assets/image/contains_alt_expected.html   |   2 +-
 .../image/contains_caption_expected.html      |   6 +-
 .../image/contains_caption_link_expected.html |   8 +-
 .../image/contains_hover_text_expected.html   |   2 +-
 ...and_text_contains_word_image_expected.html |  10 +-
 .../assets/image/contains_image_expected.html |  14 +--
 .../contains_multiple_images_expected.html    |  24 ++--
 .../image/contains_source_expected.html       |   8 +-
 .../assets/image/default_image_expected.html  |  26 +----
 .../doc_example_2_override_html_expected.html |   2 +-
 .../doc_example_2_override_html_template.html |   2 +-
 .../doc_example_basic_usage_expected.html     |  12 +-
 .../doc_example_override_html_expected.html   |   2 +-
 .../doc_example_override_html_template.html   |   2 +-
 .../assets/image/external_image_expected.html |   6 +-
 .../image_in_numbered_list_expected.html      |  56 ++++-----
 .../assets/image/internal_image_expected.html |  10 +-
 ...text_contains_the_word_image_expected.html |   8 +-
 .../doc_example_iframe_usage_expected.html    |   4 +-
 .../doc_example_override_html_expected.html   |   6 +-
 .../doc_example_override_html_template.html   |  34 +++---
 ...doc_example_whole_page_usage_expected.html |   8 +-
 .../assets/jinja/doc_example_basic_usage.md   |  10 +-
 .../doc_example_basic_usage_expected.html     |  10 +-
 .../ordered_list_loose_expected.html          |  28 ++---
 ...red_list_multiple_paragraphs_expected.html |  42 +++----
 .../ordered_list_tight_expected.html          |  16 +--
 .../ordered_list_tight_nested_expected.html   |  28 ++---
 .../markdown-override/sane_list_expected.html |  16 +--
 .../sane_list_python_markdown_expected.html   |  12 +-
 ...nordered_list_asterisk_loose_expected.html |  28 ++---
 ...nordered_list_asterisk_tight_expected.html |  16 +--
 .../unordered_list_loose_nested_expected.html |  52 ++++-----
 .../unordered_list_mixed_nested_expected.html |  40 +++----
 .../unordered_list_tight_nested_expected.html |  28 ++---
 .../panel/contains_inner_image_expected.html  |  37 ++----
 .../panel/contains_inner_panel_expected.html  |  42 +++----
 .../contains_multiple_panels_expected.html    |  66 ++++-------
 .../doc_example_basic_usage_expected.html     |  17 +--
 .../doc_example_override_html_expected.html   |  24 ++--
 .../doc_example_override_html_template.html   |  20 ++--
 .../panel_in_numbered_list_expected.html      |  61 ++++------
 .../panel_only_in_numbered_list_expected.html |  57 ++++------
 ...parses_always_expanded_panel_expected.html |  17 +--
 ...nk_lines_multiple_paragraphs_expected.html |  41 ++-----
 .../panel/parses_expanded_panel_expected.html |  17 +--
 ...blank_lines_single_paragraph_expected.html |  17 +--
 .../doc_example_basic_usage_expected.html     |   8 +-
 .../relative-link/ftp_schema_expected.html    |   8 +-
 .../relative-link/ftp_text_expected.html      |   8 +-
 .../relative-link/ftps_schema_expected.html   |   8 +-
 .../relative-link/ftps_text_expected.html     |   8 +-
 .../relative-link/http_schema_expected.html   |   8 +-
 .../relative-link/http_text_expected.html     |   8 +-
 .../relative-link/https_schema_expected.html  |   8 +-
 .../relative-link/https_text_expected.html    |   8 +-
 .../relative-link/long_path_expected.html     |   8 +-
 .../relative-link/mailto_schema_expected.html |   8 +-
 .../relative-link/mailto_text_expected.html   |   8 +-
 .../multiple_links_expected.html              |  20 +---
 .../relative-link/news_schema_expected.html   |   8 +-
 .../relative-link/news_text_expected.html     |   8 +-
 .../relative-link/www_text_expected.html      |   8 +-
 .../doc_example_basic_usage_expected.html     |   4 +-
 .../level_two_heading_expected.html           |   4 +-
 .../multiple_headings_expected.html           |  28 ++---
 .../multiple_level_one_headings_expected.html |  28 ++---
 .../no_heading_permalink_expected.html        |   8 +-
 .../remove-title/no_headings_expected.html    |  12 +-
 .../remove-title/no_space_title_expected.html |   4 +-
 .../remove-title/processor_off_expected.html  |   8 +-
 .../assets/remove/doc_example_basic_usage.md  |  14 +--
 .../doc_example_basic_usage_expected.html     |  10 +-
 .../doc_example_basic_usage_expected.html     |   4 +-
 .../doc_example_override_html_expected.html   |   3 +-
 .../doc_example_override_html_template.html   |   6 +-
 .../example_multiple_codeblocks_expected.html |  24 ++--
 ...xample_multiple_codeblocks_expected_2.html |  16 ++-
 .../scratch/example_other_code_expected.html  |   4 +-
 .../example_separate_blocks_expected.html     |   4 +-
 .../example_split_codeblocks_expected.html    |  16 ++-
 ...mple_standard_markdown_block_expected.html |   8 +-
 .../doc_example_override_html_expected.html   |  20 ++--
 .../doc_example_override_html_template.html   |  18 +--
 .../contains_multiple_videos_expected.html    |   8 +-
 .../video/contains_no_video_expected.html     |  40 +------
 .../assets/video/contains_vimeo_video.md      |   5 -
 .../video/contains_vimeo_video_expected.html  |   5 -
 .../doc_example_basic_usage_expected.html     |   5 +-
 .../doc_example_override_html_expected.html   |   5 +-
 .../doc_example_override_html_template.html   |   5 +-
 .../video/multiple_vimeo_links_expected.html  |  11 +-
 .../multiple_youtube_links_expected.html      |  41 ++-----
 verto/tests/assets/video/vimeo_link.md        |   4 +-
 .../assets/video/vimeo_link_expected.html     |  31 +----
 verto/tests/assets/video/vimeo_player_link.md |   4 +-
 .../video/vimeo_player_link_expected.html     |  31 +----
 .../youtube_and_vimeo_links_expected.html     |  50 +++-----
 .../video/youtube_be_link_expected.html       |  11 +-
 .../video/youtube_embed_link_expected.html    |  36 ++----
 .../video/youtube_watch_link_expected.html    |  39 ++-----
 verto/tests/start_tests.py                    |   3 +-
 179 files changed, 1021 insertions(+), 2431 deletions(-)
 delete mode 100644 docs/source/processors/beautify.rst
 delete mode 100644 verto/processors/BeautifyPostprocessor.py
 delete mode 100644 verto/tests/BeautifyTest.py
 delete mode 100644 verto/tests/assets/video/contains_vimeo_video.md
 delete mode 100644 verto/tests/assets/video/contains_vimeo_video_expected.html

diff --git a/docs/source/processors/beautify.rst b/docs/source/processors/beautify.rst
deleted file mode 100644
index a848277c..00000000
--- a/docs/source/processors/beautify.rst
+++ /dev/null
@@ -1,31 +0,0 @@
-.. _beautify:
-
-Beautify
-#######################################
-
-**Processor name:** ``beautify``
-
-The ``beautify`` processor is a post-processor that tidies and prettifies the HTML to give consistent and predictable output. The processor works by applying the prettify function from the ``beautifulsoup4`` library just before the final output, this means HTML elements will be separated onto individual lines where children are indented by one space. For example given the following document:
-
-.. literalinclude:: ../../../verto/tests/assets/beautify/doc_example_basic_usage.md
-  :language: none
-
-Verto will prettify it into:
-
-.. literalinclude:: ../../../verto/tests/assets/beautify/doc_example_basic_usage_expected.html
-  :language: html
-
-Special Case(s)
-***************************************
-
-For example given the following Markdown:
-
-.. literalinclude:: ../../../verto/tests/assets/beautify/example_inline_code.md
-  :language: none
-
-Verto with ``beautify`` enabled will produce the following html:
-
-.. literalinclude:: ../../../verto/tests/assets/beautify/example_inline_code_expected.html
-  :language: html
-
-Where the ``code`` tag and its contents are unchanged to preserve formatting, this is especially important for whitespace dependent languages.
diff --git a/verto/VertoExtension.py b/verto/VertoExtension.py
index cff7098d..f2d8df3e 100644
--- a/verto/VertoExtension.py
+++ b/verto/VertoExtension.py
@@ -9,7 +9,6 @@
 from verto.processors.RemoveTitlePreprocessor import RemoveTitlePreprocessor
 from verto.processors.SaveTitlePreprocessor import SaveTitlePreprocessor
 from verto.processors.GlossaryLinkPattern import GlossaryLinkPattern
-from verto.processors.BeautifyPostprocessor import BeautifyPostprocessor
 from verto.processors.ConditionalProcessor import ConditionalProcessor
 from verto.processors.StylePreprocessor import StylePreprocessor
 from verto.processors.RemovePostprocessor import RemovePostprocessor
@@ -98,7 +97,6 @@ def update_processors(processors, markdown_processors):
 
         md.preprocessors.add('style', StylePreprocessor(self, md), '_begin')
         md.postprocessors.add('remove', RemovePostprocessor(md), '_end')
-        md.postprocessors.add('beautify', BeautifyPostprocessor(md), '_end')
         md.postprocessors.add('jinja', JinjaPostprocessor(md), '_end')
 
         # Compatibility modules
diff --git a/verto/html-templates/boxed-text.html b/verto/html-templates/boxed-text.html
index 18c22971..12e4bb64 100644
--- a/verto/html-templates/boxed-text.html
+++ b/verto/html-templates/boxed-text.html
@@ -1,5 +1,5 @@
 <div class='boxed-text{% if indented %} boxed-text-indented{% endif %}'>
 {% autoescape false -%}
 {{ text }}
-{%- endautoescape %}
+{% endautoescape -%}
 </div>
diff --git a/verto/html-templates/glossary-link.html b/verto/html-templates/glossary-link.html
index dc4d18f0..7fb89faa 100644
--- a/verto/html-templates/glossary-link.html
+++ b/verto/html-templates/glossary-link.html
@@ -1,5 +1,3 @@
 <a class="glossary-term"
  data-glossary-term="{{ term }}"
- {% if id %} id="{{ id }}" {% endif %}>
- {{ text }}
-</a>
+ {% if id %} id="{{ id }}" {% endif %}>{{ text }}</a>
diff --git a/verto/html-templates/heading.html b/verto/html-templates/heading.html
index ad4a56af..0df83a38 100644
--- a/verto/html-templates/heading.html
+++ b/verto/html-templates/heading.html
@@ -1,24 +1,24 @@
 <{{ heading_type }} id="{{ title_slug }}">
-  <span class="section_number">
-    {% if heading_level >= 1 -%}
-    {{ "{{ chapter.number }}" }}
-    {%- endif -%}
-    {%- if heading_level >= 2 -%}
-    .{{ level_2 }}
-    {%- endif -%}
-    {%- if heading_level >= 3 -%}
-    .{{ level_3 }}
-    {%- endif -%}
-    {%- if heading_level >= 4 -%}
-    .{{ level_4 }}
-    {%- endif -%}
-    {%- if heading_level >= 5 -%}
-    .{{ level_5 }}
-    {%- endif -%}
-    {%- if heading_level >= 6 -%}
-    .{{ level_6 }}
-    {%- endif -%}
-    .
-  </span>
-  {{ title }}
+<span class="section_number">
+{% if heading_level >= 1 -%}
+{{ "{{ chapter.number }}" }}
+{%- endif -%}
+{%- if heading_level >= 2 -%}
+.{{ level_2 }}
+{%- endif -%}
+{%- if heading_level >= 3 -%}
+.{{ level_3 }}
+{%- endif -%}
+{%- if heading_level >= 4 -%}
+.{{ level_4 }}
+{%- endif -%}
+{%- if heading_level >= 5 -%}
+.{{ level_5 }}
+{%- endif -%}
+{%- if heading_level >= 6 -%}
+.{{ level_6 }}
+{%- endif -%}
+.
+</span>
+{{ title }}
 </{{ heading_type }}>
diff --git a/verto/html-templates/iframe.html b/verto/html-templates/iframe.html
index b4436685..5181a1c6 100644
--- a/verto/html-templates/iframe.html
+++ b/verto/html-templates/iframe.html
@@ -1,5 +1,3 @@
 <iframe src="{{ link }}">
- <p>
-  Your browser does not support iframes.
- </p>
+<p>Your browser does not support iframes.</p>
 </iframe>
diff --git a/verto/html-templates/image.html b/verto/html-templates/image.html
index adfbb35d..b9f4013d 100644
--- a/verto/html-templates/image.html
+++ b/verto/html-templates/image.html
@@ -1,14 +1,14 @@
 <div>
-  <img src="{{ file_path }}"
-    {% if alt %} alt="{{ alt }}" {% endif -%}
-    {%- if hover_text %} title="{{ hover_text }}" {% endif -%}
-    class="{% if alignment == 'left' %}left-align{% elif alignment =='center' %}center-align{% elif alignment =='right' %}right-align{% endif %}">
-  {%- if caption and caption_link -%}
-  <p><a href="{{ caption_link }}">{{ caption }}</a></p>
-  {%- elif caption -%}
-  <p>{{ caption }}</p>
-  {%- endif -%}
-  {%- if source_link -%}
-  <p><a href="{{ source_link }}">Source</a></p>
-  {%- endif -%}
+<img src="{{ file_path }}"
+{% if alt %} alt="{{ alt }}" {% endif -%}
+{%- if hover_text %} title="{{ hover_text }}" {% endif -%}
+ class="{% if alignment == 'left' %}left-align{% elif alignment =='center' %}center-align{% elif alignment =='right' %}right-align{% endif %}">
+{% if caption and caption_link -%}
+<p><a href="{{ caption_link }}">{{ caption }}</a></p>
+{%- elif caption -%}
+<p>{{ caption }}</p>
+{%- endif -%}
+{%- if source_link -%}
+<p><a href="{{ source_link }}">Source</a></p>
+{%- endif -%}
 </div>
diff --git a/verto/html-templates/interactive.html b/verto/html-templates/interactive.html
index a5154713..2a5d5c08 100644
--- a/verto/html-templates/interactive.html
+++ b/verto/html-templates/interactive.html
@@ -1,22 +1,22 @@
 {%- if type == 'in-page' -%}
-  <remove>
-    {{ "{% include 'interactive/" }}{{ name }}{{ "/index.html' %}" }}
-  </remove>
+<remove>
+{{ "{% include 'interactive/" }}{{ name }}{{ "/index.html' %}" }}
+</remove>
 {% elif type == 'iframe' -%}
-  <iframe src="{{ "{% url 'interactive' name='" }}{{ name }}{{ "' %}" }}{% if parameters %}?{{ parameters }}{% endif %}">
-    <p>Your browser does not support iframes.</p>
-  </iframe>
+<iframe src="{{ "{% url 'interactive' name='" }}{{ name }}{{ "' %}" }}{% if parameters %}?{{ parameters }}{% endif %}">
+<p>Your browser does not support iframes.</p>
+</iframe>
 {% elif type == 'whole-page' -%}
-  <a
-    href="{{ "{% url 'interactive' name='" }}{{ name }}{{ "' %}" }}{% if parameters %}?{{ parameters }}{% endif %}"
-    class="btn btn-interactive-link">
-    <img class="btn-interactive-link-image" src="{{ file_path }}"/>
-    <div class="btn-interactive-whole-page-text">
-      {% if text -%}
-        {{ text }}
-      {% else -%}
-        Click to load {{ name }}
-      {% endif -%}
-    </div>
-  </a>
+<a
+   href="{{ "{% url 'interactive' name='" }}{{ name }}{{ "' %}" }}{% if parameters %}?{{ parameters }}{% endif %}"
+   class="btn btn-interactive-link">
+<img class="btn-interactive-link-image" src="{{ file_path }}"/>
+<div class="btn-interactive-whole-page-text">
+{% if text -%}
+{{ text }}
+{% else -%}
+Click to load {{ name }}
+{% endif -%}
+</div>
+</a>
 {%- endif -%}
diff --git a/verto/html-templates/panel.html b/verto/html-templates/panel.html
index 48134631..e794e485 100644
--- a/verto/html-templates/panel.html
+++ b/verto/html-templates/panel.html
@@ -1,10 +1,10 @@
 <div class='panel panel-{{ type }}{% if expanded == 'always'%} panel-expanded-always{% elif expanded == 'true' %} panel-expanded{% endif %}'>
-  <div class='panel-header'>
-    <strong>{{ title }}{% if subtitle %}:</strong> {{ subtitle }}{% else %}</strong>{% endif %}
-  </div>
-  <div class='panel-body'>
-    {% autoescape false -%}
-    {{ content }}
-    {%- endautoescape %}
-  </div>
+<div class='panel-header'>
+<strong>{{ title }}{% if subtitle %}:</strong> {{ subtitle }}{% else %}</strong>{% endif %}
+</div>
+<div class='panel-body'>
+{% autoescape false -%}
+{{ content }}
+{% endautoescape -%}
+</div>
 </div>
diff --git a/verto/html-templates/relative-link.html b/verto/html-templates/relative-link.html
index 888f21ba..5a99930a 100644
--- a/verto/html-templates/relative-link.html
+++ b/verto/html-templates/relative-link.html
@@ -1,3 +1 @@
-<a href='{{ "{{ base_path }}" }}{{ link_path }}'>
-  {{ text }}
- </a>
+<a href='{{ "{{ base_path }}" }}{{ link_path }}'>{{ text }}</a>
diff --git a/verto/html-templates/scratch.html b/verto/html-templates/scratch.html
index c00cc825..5e504c44 100644
--- a/verto/html-templates/scratch.html
+++ b/verto/html-templates/scratch.html
@@ -1,6 +1,6 @@
 <div class="scratch-inline-images">
-  {% for hash in images -%}
-    <object type="image/svg+xml" data="{% autoescape false -%}{{ "{% static '" }}scratch-blocks-{{ hash }}.svg{{ "' %}" }}{%- endautoescape %}">
-    </object>
-  {% endfor -%}
+{% for hash in images -%}
+<object type="image/svg+xml" data="{% autoescape false -%}{{ "{% static '" }}scratch-blocks-{{ hash }}.svg{{ "' %}" }}{%- endautoescape %}">
+</object>
+{% endfor -%}
 </div>
diff --git a/verto/html-templates/table-of-contents.html b/verto/html-templates/table-of-contents.html
index f5e57596..b0aa0298 100644
--- a/verto/html-templates/table-of-contents.html
+++ b/verto/html-templates/table-of-contents.html
@@ -1,3 +1,3 @@
 <remove>
-  {{ "{{ table_of_contents }}" }}
+{{ "{{ table_of_contents }}" }}
 </remove>
diff --git a/verto/html-templates/video.html b/verto/html-templates/video.html
index afa588ad..88f11eff 100644
--- a/verto/html-templates/video.html
+++ b/verto/html-templates/video.html
@@ -1,3 +1,3 @@
 <div>
-  <iframe allowfullscreen='allowfullscreen' frameborder='0' src='{{ video_url }}'></iframe>
+<iframe allowfullscreen='allowfullscreen' frameborder='0' src='{{ video_url }}'></iframe>
 </div>
diff --git a/verto/processors/BeautifyPostprocessor.py b/verto/processors/BeautifyPostprocessor.py
deleted file mode 100644
index d0aa9b48..00000000
--- a/verto/processors/BeautifyPostprocessor.py
+++ /dev/null
@@ -1,86 +0,0 @@
-from markdown.postprocessors import Postprocessor
-from markdown.util import HtmlStash
-from markdown.odict import OrderedDict
-from bs4 import BeautifulSoup
-import re
-
-
-class BeautifyPostprocessor(Postprocessor):
-    ''' Converts the output document into a more asthetically
-    pleasing version with more consistent whitespace.
-    '''
-
-    def __init__(self, *args, **kwargs):
-        ''' Creates a new BeautifyPostprocessor.
-        '''
-        super().__init__(*args, **kwargs)
-        self.pre_pattern = re.compile(r'<pre>.*?</pre>', re.DOTALL)
-        self.code_pattern = re.compile(r'<code>(?P<code>.*?)</code>', re.DOTALL)
-        self.html_stash = HtmlStash()
-
-    def run(self, text):
-        '''Converts the document into a more asthetically
-        pleasing version.
-        Args:
-            text: A string of the document to convert.
-        Returns:
-            A string of the converted document.
-        '''
-        text = self.store_non_pre_code_tags(text)
-        text = BeautifulSoup(text, 'html.parser').prettify(formatter='html')
-        text = self.restore_non_pre_code_tags(text)
-        return text
-
-    def store_non_pre_code_tags(self, text):
-        '''Stores code tags that are not in pre tags to preserve
-        whitespacing, replacing with placeholders.
-
-        Args:
-            text: A string of the document to process.
-        Returns:
-            The document with code blocks replaced with placeholders.
-        '''
-        prepass_text = text
-        pre_spans = []
-
-        match = self.pre_pattern.search(prepass_text)
-        while match is not None:
-            pre_spans.append(match.span())
-            prepass_text = prepass_text[match.end():]
-            match = self.pre_pattern.search(prepass_text)
-
-        out_text = ''
-        match = self.code_pattern.search(text)
-        while match is not None:
-            if not any(match.start() in range(*span) or match.end() in range(*span) for span in pre_spans):
-                html_string = match.group()
-                placeholder = self.html_stash.store(html_string, True)
-                out_text = text[:match.start()] + placeholder
-            else:
-                out_text = text[:match.end()]
-            text = text[match.end():]
-            match = self.pre_pattern.search(text)
-        out_text += text
-
-        return out_text
-
-    def restore_non_pre_code_tags(self, text):
-        '''Restores code tags that are not in pre tags by replacing
-         placeholders. This is to preserve whitespacing.
-
-        Args:
-            text: A string of the document to process.
-        Returns:
-            The document with placeholders replaced with stored
-            code blocks.
-        '''
-        replacements = OrderedDict()
-        for i in range(self.html_stash.html_counter):
-            html, safe = self.html_stash.rawHtmlBlocks[i]
-            replacements[self.html_stash.get_placeholder(i)] = html
-
-        if len(replacements) > 0:
-            pattern = re.compile('|'.join(re.escape(k) for k in replacements))
-            text = pattern.sub(lambda m: replacements[m.group(0)], text)
-
-        return text
diff --git a/verto/processors/GenericContainerBlockProcessor.py b/verto/processors/GenericContainerBlockProcessor.py
index ed79c5e8..1843ae25 100644
--- a/verto/processors/GenericContainerBlockProcessor.py
+++ b/verto/processors/GenericContainerBlockProcessor.py
@@ -100,6 +100,7 @@ def run(self, parent, blocks):
         content = ''
         for child in content_tree:
             content += HtmlSerializer.tostring(child) + '\n'
+        content = content.strip('\n')
 
         if content.strip() == '':
             message = 'content cannot be blank.'
diff --git a/verto/tests/BeautifyTest.py b/verto/tests/BeautifyTest.py
deleted file mode 100644
index 74a25a4d..00000000
--- a/verto/tests/BeautifyTest.py
+++ /dev/null
@@ -1,62 +0,0 @@
-import markdown
-from verto.VertoExtension import VertoExtension
-from verto.tests.ProcessorTest import ProcessorTest
-
-class BeautifyTest(ProcessorTest):
-    '''The major concern with beautifying is that preformatted tags and
-    code blocks are unchanged. The tests here cover these cases.
-    '''
-
-    def __init__(self, *args, **kwargs):
-        '''Set processor name in class for file names.
-        '''
-        ProcessorTest.__init__(self, *args, **kwargs)
-        self.processor_name = 'beautify'
-
-    def test_doc_example_basic(self):
-        '''Checks that basic usecase works as expected.
-        '''
-        test_string = self.read_test_file(self.processor_name, 'doc_example_basic_usage.md')
-
-        converted_test_string = markdown.markdown(test_string, extensions=[self.verto_extension])
-        expected_string = self.read_test_file(self.processor_name, 'doc_example_basic_usage_expected.html', strip=True)
-        self.assertEqual(expected_string, converted_test_string)
-
-    def test_example_inline_code(self):
-        '''Tests to see that inline code formatting is unchanged.
-        '''
-        test_string = self.read_test_file(self.processor_name, 'example_inline_code.md')
-
-        converted_test_string = markdown.markdown(test_string, extensions=[self.verto_extension])
-        expected_string = self.read_test_file(self.processor_name, 'example_inline_code_expected.html', strip=True)
-        self.assertEqual(expected_string, converted_test_string)
-
-    def test_example_preformatted_code(self):
-        '''Tests to ensure that preformatted tag content is unchanged.
-        '''
-        test_string = self.read_test_file(self.processor_name, 'example_preformatted_code.md')
-
-        converted_test_string = markdown.markdown(test_string, extensions=[self.verto_extension])
-        expected_string = self.read_test_file(self.processor_name, 'example_preformatted_code_expected.html', strip=True)
-        self.assertEqual(expected_string, converted_test_string)
-
-    def test_example_preformatted_code_with_extension(self):
-        '''Tests to ensure that the fenced_code extension does not
-        change output to retain compatibility.
-        '''
-        verto_extension = VertoExtension([self.processor_name], {}, ['markdown.extensions.fenced_code'])
-        test_string = self.read_test_file(self.processor_name, 'example_preformatted_code_with_extension.md')
-
-        converted_test_string = markdown.markdown(test_string, extensions=[verto_extension, 'markdown.extensions.fenced_code'])
-        expected_string = self.read_test_file(self.processor_name, 'example_preformatted_code_with_extension_expected.html', strip=True)
-        self.assertEqual(expected_string, converted_test_string)
-
-    def text_example_mixed_code_types(self):
-        '''Tests that all types of code blocks remain unchanged when
-        used together.
-        '''
-        test_string = self.read_test_file(self.processor_name, 'example_mixed_code_types.md')
-
-        converted_test_string = markdown.markdown(test_string, extensions=[self.verto_extension])
-        expected_string = self.read_test_file(self.processor_name, 'example_mixed_code_types_expected.html', strip=True)
-        self.assertEqual(expected_string, converted_test_string)
diff --git a/verto/tests/ConfigurationTest.py b/verto/tests/ConfigurationTest.py
index f4405d2f..3ed3ed74 100644
--- a/verto/tests/ConfigurationTest.py
+++ b/verto/tests/ConfigurationTest.py
@@ -247,20 +247,26 @@ def test_multiline_custom_templates(self):
         and used correctly.
         '''
         custom_templates = {
-            'image': '''<div class="text-center">
-                          <img src="{{ file_path }}" class="rounded img-thumbnail"/>
-                        </div>''',
-            'boxed-text': '''<div class="card">
-                               <div class="card-block">
-                                 {{ text }}
-                               </div>
-                             </div>''',
-            'heading': '''<{{ heading_type }} id="{{ title_slug }}">
-                            <span class="section_number">
-                              {{ level_1 }}.{{ level_2 }}.{{ level_3 }}.{{ level_4 }}.{{ level_5 }}.{{ level_6 }}.
-                            </span>
-                            {{ title }}
-                          </{{ heading_type }}>'''
+            'image': \
+'''<div class="text-center">
+<img src="{{ file_path }}" class="rounded img-thumbnail"/>
+</div>''',
+
+            'boxed-text': \
+'''<div class="card">
+<div class="card-block">
+{{ text }}
+</div>
+</div>''',
+
+            'heading': \
+'''<{{ heading_type }} id="{{ title_slug }}">
+<span class="section_number">
+{{ level_1 }}.{{ level_2 }}.{{ level_3 }}.{{ level_4 }}.{{ level_5 }}.{{ level_6 }}.
+</span>
+{{ title }}
+</{{ heading_type }}>'''
+
         }
 
         verto = Verto(html_templates=custom_templates)
diff --git a/verto/tests/VideoTest.py b/verto/tests/VideoTest.py
index 87171b68..61d88c66 100644
--- a/verto/tests/VideoTest.py
+++ b/verto/tests/VideoTest.py
@@ -162,6 +162,17 @@ def test_missing_identifier(self):
 
         self.assertRaises(NoVideoIdentifierError, lambda x: markdown.markdown(x, extensions=[self.verto_extension]), test_string)
 
+    def test_contains_multiple_videos(self):
+        '''Tests output of multiple video links.
+        '''
+        test_string = self.read_test_file(self.processor_name, 'contains_multiple_videos.md')
+        blocks = self.to_blocks(test_string)
+
+        self.assertListEqual([False, False, True, False, True, False, True, False], [VideoBlockProcessor(self.ext, self.md.parser).test(blocks, block) for block in blocks], msg='"{}"'.format(test_string))
+
+        converted_test_string = markdown.markdown(test_string, extensions=[self.verto_extension])
+        expected_file_string = self.read_test_file(self.processor_name, 'contains_multiple_videos_expected.html', strip=True)
+        self.assertEqual(converted_test_string, expected_file_string)
     #~
     # Doc Tests
     #~
diff --git a/verto/tests/assets/boxed-text/doc_example_basic_usage_expected.html b/verto/tests/assets/boxed-text/doc_example_basic_usage_expected.html
index daa8b571..53e3b827 100644
--- a/verto/tests/assets/boxed-text/doc_example_basic_usage_expected.html
+++ b/verto/tests/assets/boxed-text/doc_example_basic_usage_expected.html
@@ -1,10 +1,4 @@
 <div class="boxed-text">
- <p>
-  <strong>
-   Computer Science Report for 2.44
-  </strong>
- </p>
- <p>
-  Put your introduction to what bits are here.
- </p>
+<p><strong>Computer Science Report for 2.44</strong></p>
+<p>Put your introduction to what bits are here.</p>
 </div>
diff --git a/verto/tests/assets/boxed-text/doc_example_override_html_expected.html b/verto/tests/assets/boxed-text/doc_example_override_html_expected.html
index 109dba12..cf26a564 100644
--- a/verto/tests/assets/boxed-text/doc_example_override_html_expected.html
+++ b/verto/tests/assets/boxed-text/doc_example_override_html_expected.html
@@ -1,7 +1,5 @@
 <div class="card">
- <div class="card-block">
-  <p>
-   This text is displayed using a Bootstrap 4 card.
-  </p>
- </div>
+<div class="card-block">
+<p>This text is displayed using a Bootstrap 4 card.</p>
+</div>
 </div>
diff --git a/verto/tests/assets/boxed-text/doc_example_override_html_template.html b/verto/tests/assets/boxed-text/doc_example_override_html_template.html
index fe317ee1..77e162c4 100644
--- a/verto/tests/assets/boxed-text/doc_example_override_html_template.html
+++ b/verto/tests/assets/boxed-text/doc_example_override_html_template.html
@@ -1,5 +1,5 @@
 <div class="card">
-  <div class="card-block">
-    {{ text }}
-  </div>
+<div class="card-block">
+{{ text }}
+</div>
 </div>
diff --git a/verto/tests/assets/boxed-text/indented_boxed_text_expected.html b/verto/tests/assets/boxed-text/indented_boxed_text_expected.html
index 78289b50..cd5443b5 100644
--- a/verto/tests/assets/boxed-text/indented_boxed_text_expected.html
+++ b/verto/tests/assets/boxed-text/indented_boxed_text_expected.html
@@ -1,5 +1,3 @@
 <div class="boxed-text boxed-text-indented">
- <p>
-  This text is displayed using a Bootstrap 4 card.
- </p>
+<p>This text is displayed using a Bootstrap 4 card.</p>
 </div>
diff --git a/verto/tests/assets/boxed-text/multiple_boxed_text_expected.html b/verto/tests/assets/boxed-text/multiple_boxed_text_expected.html
index 568c19cb..2dbeb661 100644
--- a/verto/tests/assets/boxed-text/multiple_boxed_text_expected.html
+++ b/verto/tests/assets/boxed-text/multiple_boxed_text_expected.html
@@ -1,16 +1,8 @@
 <div class="boxed-text boxed-text-indented">
- <p>
-  This text is displayed using a Bootstrap 4 card.
- </p>
+<p>This text is displayed using a Bootstrap 4 card.</p>
 </div>
-<p>
- Aenean turpis diam, dictum nec odio ut, porta luctus nunc. Donec vulputate eu magna non finibus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Nam finibus lectus non lorem consectetur, id sollicitudin est tristique. Nulla in ultricies lectus, nec dapibus ante. Ut ullamcorper orci tincidunt ex mollis rutrum. Nam dapibus diam eu orci laoreet, et egestas quam consectetur. Vestibulum ligula leo, iaculis ac commodo lobortis, posuere ac dui. Aliquam egestas odio congue tempus cursus. Donec dictum dui facilisis enim molestie venenatis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.
-</p>
+<p>Aenean turpis diam, dictum nec odio ut, porta luctus nunc. Donec vulputate eu magna non finibus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Nam finibus lectus non lorem consectetur, id sollicitudin est tristique. Nulla in ultricies lectus, nec dapibus ante. Ut ullamcorper orci tincidunt ex mollis rutrum. Nam dapibus diam eu orci laoreet, et egestas quam consectetur. Vestibulum ligula leo, iaculis ac commodo lobortis, posuere ac dui. Aliquam egestas odio congue tempus cursus. Donec dictum dui facilisis enim molestie venenatis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.</p>
 <div class="boxed-text">
- <p>
-  Lorem ipsum dolor sit amet, consectetur adipiscing elit. In fermentum sit amet metus at congue. Fusce nec mauris accumsan, consequat mi ut, scelerisque erat. In hac habitasse platea dictumst. Phasellus maximus semper blandit. Nam consequat justo eget orci ultricies convallis. Praesent tempus sodales ipsum. Suspendisse faucibus quam vitae mollis rutrum. Fusce sit amet lacus sit amet arcu lobortis suscipit a vel nulla.
- </p>
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. In fermentum sit amet metus at congue. Fusce nec mauris accumsan, consequat mi ut, scelerisque erat. In hac habitasse platea dictumst. Phasellus maximus semper blandit. Nam consequat justo eget orci ultricies convallis. Praesent tempus sodales ipsum. Suspendisse faucibus quam vitae mollis rutrum. Fusce sit amet lacus sit amet arcu lobortis suscipit a vel nulla.</p>
 </div>
-<p>
- Mauris vestibulum vestibulum neque a mollis. Curabitur ut urna eleifend urna eleifend mollis. Aliquam malesuada luctus purus, eu maximus elit finibus sed. Ut consectetur tempus tempus. Etiam lacinia at mauris eu sagittis. Donec ante urna, semper id aliquam id.
-</p>
+<p>Mauris vestibulum vestibulum neque a mollis. Curabitur ut urna eleifend urna eleifend mollis. Aliquam malesuada luctus purus, eu maximus elit finibus sed. Ut consectetur tempus tempus. Etiam lacinia at mauris eu sagittis. Donec ante urna, semper id aliquam id.</p>
diff --git a/verto/tests/assets/boxed-text/no_boxed_text_expected.html b/verto/tests/assets/boxed-text/no_boxed_text_expected.html
index e73eabef..f4453490 100644
--- a/verto/tests/assets/boxed-text/no_boxed_text_expected.html
+++ b/verto/tests/assets/boxed-text/no_boxed_text_expected.html
@@ -1,12 +1,4 @@
-<p>
- Lorem ipsum dolor sit amet, consectetur adipiscing elit. In fermentum sit amet metus at congue. Fusce nec mauris accumsan, consequat mi ut, scelerisque erat. In hac habitasse platea dictumst. Phasellus maximus semper blandit. Nam consequat justo eget orci ultricies convallis. Praesent tempus sodales ipsum. Suspendisse faucibus quam vitae mollis rutrum. Fusce sit amet lacus sit amet arcu lobortis suscipit a vel nulla.
-</p>
-<p>
- Aenean turpis diam, dictum nec odio ut, porta luctus nunc. Donec vulputate eu magna non finibus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Nam finibus lectus non lorem consectetur, id sollicitudin est tristique. Nulla in ultricies lectus, nec dapibus ante. Ut ullamcorper orci tincidunt ex mollis rutrum. Nam dapibus diam eu orci laoreet, et egestas quam consectetur. Vestibulum ligula leo, iaculis ac commodo lobortis, posuere ac dui. Aliquam egestas odio congue tempus cursus. Donec dictum dui facilisis enim molestie venenatis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.
-</p>
-<p>
- Mauris vestibulum vestibulum neque a mollis. Curabitur ut urna eleifend urna eleifend mollis. Aliquam malesuada luctus purus, eu maximus elit finibus sed. Ut consectetur tempus tempus. Etiam lacinia at mauris eu sagittis. Donec ante urna, semper id aliquam id.
-</p>
-<p>
- boxed-text
-</p>
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. In fermentum sit amet metus at congue. Fusce nec mauris accumsan, consequat mi ut, scelerisque erat. In hac habitasse platea dictumst. Phasellus maximus semper blandit. Nam consequat justo eget orci ultricies convallis. Praesent tempus sodales ipsum. Suspendisse faucibus quam vitae mollis rutrum. Fusce sit amet lacus sit amet arcu lobortis suscipit a vel nulla.</p>
+<p>Aenean turpis diam, dictum nec odio ut, porta luctus nunc. Donec vulputate eu magna non finibus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Nam finibus lectus non lorem consectetur, id sollicitudin est tristique. Nulla in ultricies lectus, nec dapibus ante. Ut ullamcorper orci tincidunt ex mollis rutrum. Nam dapibus diam eu orci laoreet, et egestas quam consectetur. Vestibulum ligula leo, iaculis ac commodo lobortis, posuere ac dui. Aliquam egestas odio congue tempus cursus. Donec dictum dui facilisis enim molestie venenatis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.</p>
+<p>Mauris vestibulum vestibulum neque a mollis. Curabitur ut urna eleifend urna eleifend mollis. Aliquam malesuada luctus purus, eu maximus elit finibus sed. Ut consectetur tempus tempus. Etiam lacinia at mauris eu sagittis. Donec ante urna, semper id aliquam id.</p>
+<p>boxed-text</p>
diff --git a/verto/tests/assets/boxed-text/recursive_boxed_text_expected.html b/verto/tests/assets/boxed-text/recursive_boxed_text_expected.html
index bba0ec73..cb14041a 100644
--- a/verto/tests/assets/boxed-text/recursive_boxed_text_expected.html
+++ b/verto/tests/assets/boxed-text/recursive_boxed_text_expected.html
@@ -1,13 +1,7 @@
 <div class="boxed-text">
- <p>
-  This text is displayed using a Bootstrap 4 card.
- </p>
- <div class="boxed-text">
-  <p>
-   I'm inside you.
-  </p>
- </div>
- <p>
-  Where some more text might exist.
- </p>
+<p>This text is displayed using a Bootstrap 4 card.</p>
+<div class="boxed-text">
+<p>I'm inside you.</p>
+</div>
+<p>Where some more text might exist.</p>
 </div>
diff --git a/verto/tests/assets/boxed-text/single_boxed_text_expected.html b/verto/tests/assets/boxed-text/single_boxed_text_expected.html
index 1b53c3b4..a5ffb467 100644
--- a/verto/tests/assets/boxed-text/single_boxed_text_expected.html
+++ b/verto/tests/assets/boxed-text/single_boxed_text_expected.html
@@ -1,8 +1,4 @@
 <div class="boxed-text">
- <p>
-  This text is displayed using a Bootstrap 4 card.
- </p>
- <p>
-  Where some more text might exist.
- </p>
+<p>This text is displayed using a Bootstrap 4 card.</p>
+<p>Where some more text might exist.</p>
 </div>
diff --git a/verto/tests/assets/button-link/contains_button_expected.html b/verto/tests/assets/button-link/contains_button_expected.html
index 66481241..dbe1d4f7 100644
--- a/verto/tests/assets/button-link/contains_button_expected.html
+++ b/verto/tests/assets/button-link/contains_button_expected.html
@@ -1,15 +1,4 @@
-<p>
- The following interactive has a program that solves the problem for however many cities you want to select by trying out all possible routes, and recording the best so far.  You can get a feel for what an intractable problem looks like by seeing how long the interactive takes to solve the problem for different size maps.
-Try generating a map with about 5 cities, and press "Start" to solve the problem.
-</p>
-<a class="button" href="http://www.csfieldguide.org.nz/releases/1.9.9/_static/widgets/tract-tsp-basic-v2.html">
- View city trip interactive
-</a>
-<p>
- Now try it for 10 cities (twice as many). Does it take twice as long? How about twice as many again (20 cities)? What about 50 cities? Can you guess how long it would take?
-You're starting to get a feel for what it means for a problem to be
- <em>
-  intractable
- </em>
- .
-</p>
+<p>The following interactive has a program that solves the problem for however many cities you want to select by trying out all possible routes, and recording the best so far.  You can get a feel for what an intractable problem looks like by seeing how long the interactive takes to solve the problem for different size maps.
+Try generating a map with about 5 cities, and press "Start" to solve the problem.</p>
+<a class="button" href="http://www.csfieldguide.org.nz/releases/1.9.9/_static/widgets/tract-tsp-basic-v2.html">View city trip interactive</a><p>Now try it for 10 cities (twice as many). Does it take twice as long? How about twice as many again (20 cities)? What about 50 cities? Can you guess how long it would take?
+You're starting to get a feel for what it means for a problem to be <em>intractable</em>.</p>
diff --git a/verto/tests/assets/button-link/contains_file_link_button_expected.html b/verto/tests/assets/button-link/contains_file_link_button_expected.html
index f813e61c..8d93d5d9 100644
--- a/verto/tests/assets/button-link/contains_file_link_button_expected.html
+++ b/verto/tests/assets/button-link/contains_file_link_button_expected.html
@@ -1,18 +1,5 @@
-<p>
- The following interactive has a program that solves the problem for however many cities you want to select by trying out all possible routes, and recording the best so far.  You can get a feel for what an intractable problem looks like by seeing how long the interactive takes to solve the problem for different size maps.
-Try generating a map with about 5 cities, and press "Start" to solve the problem.
-</p>
-<a class="button" href="{% static 'files/python-example.py' %}">
- Example Code
-</a>
-<p>
- Now try it for 10 cities (twice as many). Does it take twice as long? How about twice as many again (20 cities)? What about 50 cities? Can you guess how long it would take?
-You're starting to get a feel for what it means for a problem to be
- <em>
-  intractable
- </em>
- .
-</p>
-<a class="button" href="http://www.csfieldguide.org.nz/releases/1.9.9/_static/widgets/tract-tsp-basic-v2.html">
- View city trip interactive
-</a>
+<p>The following interactive has a program that solves the problem for however many cities you want to select by trying out all possible routes, and recording the best so far.  You can get a feel for what an intractable problem looks like by seeing how long the interactive takes to solve the problem for different size maps.
+Try generating a map with about 5 cities, and press "Start" to solve the problem.</p>
+<a class="button" href="{% static 'files/python-example.py' %}">Example Code</a><p>Now try it for 10 cities (twice as many). Does it take twice as long? How about twice as many again (20 cities)? What about 50 cities? Can you guess how long it would take?
+You're starting to get a feel for what it means for a problem to be <em>intractable</em>.</p>
+<a class="button" href="http://www.csfieldguide.org.nz/releases/1.9.9/_static/widgets/tract-tsp-basic-v2.html">View city trip interactive</a>
diff --git a/verto/tests/assets/button-link/contains_multiple_buttons_expected.html b/verto/tests/assets/button-link/contains_multiple_buttons_expected.html
index 56e7adee..6ba4de7c 100644
--- a/verto/tests/assets/button-link/contains_multiple_buttons_expected.html
+++ b/verto/tests/assets/button-link/contains_multiple_buttons_expected.html
@@ -1,35 +1,10 @@
-<p>
- You can try out this 3D matrix in the following interactive.
-</p>
-<a class="button" href="http://www.csfieldguide.org.nz/releases/1.9.9/_static/widgets/CG/CG-mini-editor/main%20(cutdown).html?info=%0AIn%20this%20interactive,%20try%20changing%20the%20scaling%20on%20the%20image%20(it%20starts%20with%20a%20scaling%20factor%20of%2010%20in%20all%20three%20dimensions).">
- Click for interactive: 3D transform matrix
-</a>
-<p>
- The above image mesh has 3644 points in it, and your matrix was applied to each one of them to work out the new image.
-</p>
-<p>
- The next interactive allows you to do translation (using a vector).
-Use it to get used to translating in the three dimensions (don't worry about using matrices this time.)
-</p>
-<a class="button" href="http://www.csfieldguide.org.nz/releases/1.9.9/_static/widgets/CG/CG-mini-editor/main%20(cutdown).html?info=%0ATranslation%20requires%203%20values,%20which%20are%20added%20to%20the%20*x*,%20*y*%20and%20*z*%20coordinates%20of%20each%20point%20in%20an%20object.%3Cp%3EIn%20the%20following%20interactive,%20try%20moving%20the%20teapot%20left%20and%20right%20(%20%3Cem%3Ex%3C/em%3E%20),%20up%20and%20down%20(%20%3Cem%3Ey%3C/em%3E%20),%20and%20in%20and%20out%20of%20the%20screen%20(%20%3Cem%3Ez%3C/em%3E%20)%20by%20adding%20a%20%E2%80%9Cvector%E2%80%9D%20to%20the%20operations.%20Then%20try%20combining%20all%20three.%3C/p%3E%0A">
- Click for interactive: 3D translation
-</a>
-<p>
- Rotation is trickier because you can now rotate in different directions.
-In 2D rotations were around the centre (origin) of the grid, but in 3D rotations are around a line (either the horizontal x-axis, the vertical y-axis, or the z-axis, which goes into the screen!)
-</p>
-<p>
- The 2D rotation we used earlier can be applied to 3 dimensions using this matrix:
-</p>
-<a class="button" href="http://www.csfieldguide.org.nz/releases/1.9.9/_static/widgets/CG/CG-mini-editor/main%20(cutdown).html?info=%0AYou%20can%20experiment%20with%20moving%20the%20teapot%20around%20in%20space,%20changing%20its%20size,%20and%20angle.%3Cdl%20class=%22docutils%22%3E%0A%3Cdt%3EThink%20about%20the%20order%20in%20which%20you%20need%20to%20combine%20the%20transforms%20to%20get%20a%20particular%20image%20that%20you%20want.%3C/dt%3E%0A%3Cdd%3EFor%20example,%20if%20you%20translate%20an%20image%20and%20then%20scale%20it,%20you%E2%80%99ll%20get%20a%20different%20effect%20to%20scaling%20it%20then%20translating%20it.%0AIf%20you%20want%20to%20rotate%20or%20scale%20around%20a%20particular%20point,%20you%20can%20do%20this%20in%20three%20steps%20(as%20with%20the%202D%20case%20above):%20(1)%20translate%20the%20object%20so%20that%20the%20point%20you%20want%20to%20scale%20or%20rotate%20around%20is%20the%20origin%20(where%20the%20x,%20y%20and%20z%20axes%20meet),%20(2)%20do%20the%20scaling/rotation,%20(3)%20translate%20the%20object%20back%20to%20where%20it%20was.%20If%20you%20just%20scale%20an%20object%20where%20it%20is,%20its%20distance%20from%20the%20origin%20will%20also%20be%20scaled%20up.%3C/dd%3E%0A%3C/dl%3E%0A">
- Click for interactive: 3D with multiple matrices and vectors
-</a>
-<p>
- In the above examples, when you have several matrices being applied to every point in the image, a lot of time can be saved by converting the series of matrices and transforms to just one formula that does all of the transforms in one go. The following interactive can do those calculations for you.
-</p>
-<p>
- For example, in the following interactive, type in the matrix for doubling the size of an object (put the number 2 instead of 1 on the main diagonal values), then add another matrix that triples the size of the image (3 on the main diagonal). The interactive shows a matrix on the right that combines the two --- does it look right?
-</p>
-<a class="button" href="http://www.csfieldguide.org.nz/releases/1.9.9/_static/widgets/CG/CG-matrix-simplifier/CG-matrix-simplifier.html?info=Multiple%20transforms">
- Click for interactive: matrix simplifier
-</a>
+<p>You can try out this 3D matrix in the following interactive.</p>
+<a class="button" href="http://www.csfieldguide.org.nz/releases/1.9.9/_static/widgets/CG/CG-mini-editor/main%20(cutdown).html?info=%0AIn%20this%20interactive,%20try%20changing%20the%20scaling%20on%20the%20image%20(it%20starts%20with%20a%20scaling%20factor%20of%2010%20in%20all%20three%20dimensions).">Click for interactive: 3D transform matrix</a><p>The above image mesh has 3644 points in it, and your matrix was applied to each one of them to work out the new image.</p>
+<p>The next interactive allows you to do translation (using a vector).
+Use it to get used to translating in the three dimensions (don't worry about using matrices this time.)</p>
+<a class="button" href="http://www.csfieldguide.org.nz/releases/1.9.9/_static/widgets/CG/CG-mini-editor/main%20(cutdown).html?info=%0ATranslation%20requires%203%20values,%20which%20are%20added%20to%20the%20*x*,%20*y*%20and%20*z*%20coordinates%20of%20each%20point%20in%20an%20object.%3Cp%3EIn%20the%20following%20interactive,%20try%20moving%20the%20teapot%20left%20and%20right%20(%20%3Cem%3Ex%3C/em%3E%20),%20up%20and%20down%20(%20%3Cem%3Ey%3C/em%3E%20),%20and%20in%20and%20out%20of%20the%20screen%20(%20%3Cem%3Ez%3C/em%3E%20)%20by%20adding%20a%20%E2%80%9Cvector%E2%80%9D%20to%20the%20operations.%20Then%20try%20combining%20all%20three.%3C/p%3E%0A">Click for interactive: 3D translation</a><p>Rotation is trickier because you can now rotate in different directions.
+In 2D rotations were around the centre (origin) of the grid, but in 3D rotations are around a line (either the horizontal x-axis, the vertical y-axis, or the z-axis, which goes into the screen!)</p>
+<p>The 2D rotation we used earlier can be applied to 3 dimensions using this matrix:</p>
+<a class="button" href="http://www.csfieldguide.org.nz/releases/1.9.9/_static/widgets/CG/CG-mini-editor/main%20(cutdown).html?info=%0AYou%20can%20experiment%20with%20moving%20the%20teapot%20around%20in%20space,%20changing%20its%20size,%20and%20angle.%3Cdl%20class=%22docutils%22%3E%0A%3Cdt%3EThink%20about%20the%20order%20in%20which%20you%20need%20to%20combine%20the%20transforms%20to%20get%20a%20particular%20image%20that%20you%20want.%3C/dt%3E%0A%3Cdd%3EFor%20example,%20if%20you%20translate%20an%20image%20and%20then%20scale%20it,%20you%E2%80%99ll%20get%20a%20different%20effect%20to%20scaling%20it%20then%20translating%20it.%0AIf%20you%20want%20to%20rotate%20or%20scale%20around%20a%20particular%20point,%20you%20can%20do%20this%20in%20three%20steps%20(as%20with%20the%202D%20case%20above):%20(1)%20translate%20the%20object%20so%20that%20the%20point%20you%20want%20to%20scale%20or%20rotate%20around%20is%20the%20origin%20(where%20the%20x,%20y%20and%20z%20axes%20meet),%20(2)%20do%20the%20scaling/rotation,%20(3)%20translate%20the%20object%20back%20to%20where%20it%20was.%20If%20you%20just%20scale%20an%20object%20where%20it%20is,%20its%20distance%20from%20the%20origin%20will%20also%20be%20scaled%20up.%3C/dd%3E%0A%3C/dl%3E%0A">Click for interactive: 3D with multiple matrices and vectors</a><p>In the above examples, when you have several matrices being applied to every point in the image, a lot of time can be saved by converting the series of matrices and transforms to just one formula that does all of the transforms in one go. The following interactive can do those calculations for you.</p>
+<p>For example, in the following interactive, type in the matrix for doubling the size of an object (put the number 2 instead of 1 on the main diagonal values), then add another matrix that triples the size of the image (3 on the main diagonal). The interactive shows a matrix on the right that combines the two --- does it look right?</p>
+<a class="button" href="http://www.csfieldguide.org.nz/releases/1.9.9/_static/widgets/CG/CG-matrix-simplifier/CG-matrix-simplifier.html?info=Multiple%20transforms">Click for interactive: matrix simplifier</a>
diff --git a/verto/tests/assets/button-link/doc_example_basic_usage_expected.html b/verto/tests/assets/button-link/doc_example_basic_usage_expected.html
index 87283030..16d4b42f 100644
--- a/verto/tests/assets/button-link/doc_example_basic_usage_expected.html
+++ b/verto/tests/assets/button-link/doc_example_basic_usage_expected.html
@@ -1,3 +1 @@
-<a class="button" href="http://www.google.com">
- Visit Google
-</a>
+<a class="button" href="http://www.google.com">Visit Google</a>
diff --git a/verto/tests/assets/button-link/doc_example_file_usage_expected.html b/verto/tests/assets/button-link/doc_example_file_usage_expected.html
index 78640424..a4373737 100644
--- a/verto/tests/assets/button-link/doc_example_file_usage_expected.html
+++ b/verto/tests/assets/button-link/doc_example_file_usage_expected.html
@@ -1,3 +1 @@
-<a class="button" href="{% static 'files/python-sort-example.py' %}">
- Download Python Sorting Example
-</a>
+<a class="button" href="{% static 'files/python-sort-example.py' %}">Download Python Sorting Example</a>
diff --git a/verto/tests/assets/button-link/doc_example_override_html_expected.html b/verto/tests/assets/button-link/doc_example_override_html_expected.html
index 677abcd3..2337fa6d 100644
--- a/verto/tests/assets/button-link/doc_example_override_html_expected.html
+++ b/verto/tests/assets/button-link/doc_example_override_html_expected.html
@@ -1,3 +1 @@
-<a class="btn btn-primary" href="https://github.com/uccser/verto">
- Verto on GitHub
-</a>
+<a class="btn btn-primary" href="https://github.com/uccser/verto">Verto on GitHub</a>
diff --git a/verto/tests/assets/button-link/missing_end_brace_expected.html b/verto/tests/assets/button-link/missing_end_brace_expected.html
index 107c4d51..23474043 100644
--- a/verto/tests/assets/button-link/missing_end_brace_expected.html
+++ b/verto/tests/assets/button-link/missing_end_brace_expected.html
@@ -1,9 +1,3 @@
-<p>
- Try generating a map with about 5 cities, and press "Start" to solve the problem.
-</p>
-<p>
- {button-link link="http://www.csfieldguide.org.nz/releases/1.9.9/_static/widgets/tract-tsp-basic-v2.html" text="View city trip interactive"
-</p>
-<p>
- Now try it for 10 cities (twice as many). Does it take twice as long? How about twice as many again (20 cities)? What about 50 cities? Can you guess how long it would take?
-</p>
+<p>Try generating a map with about 5 cities, and press "Start" to solve the problem.</p>
+<p>{button-link link="http://www.csfieldguide.org.nz/releases/1.9.9/_static/widgets/tract-tsp-basic-v2.html" text="View city trip interactive"</p>
+<p>Now try it for 10 cities (twice as many). Does it take twice as long? How about twice as many again (20 cities)? What about 50 cities? Can you guess how long it would take?</p>
diff --git a/verto/tests/assets/button-link/no_button_expected.html b/verto/tests/assets/button-link/no_button_expected.html
index 7c7b7b6f..555d56a7 100644
--- a/verto/tests/assets/button-link/no_button_expected.html
+++ b/verto/tests/assets/button-link/no_button_expected.html
@@ -1,29 +1,7 @@
-<p>
- Finally, you&rsquo;re the top layer of the system. You use the program but you will (hopefully) never have to interact with the more complicated parts of the operating system such as driver software, let alone the hardware. In this way, you can use the computer without ever having to worry about these things.
-</p>
-<p>
- {image filename="computer-layers.png" alt="The computer can be broken down into multiple layers, starting with the user, then the programs, then the operating system, then finally the hardware." caption="The computer can be broken down into multiple layers, starting with the user, then the programs, then the operating system, then finally the hardware."}
-</p>
-<p>
- We call a system like this a
- <em>
-  layered system
- </em>
- . You can have any number of layers you want but each layer can only communicate with the one directly below it. The operating system can directly access the hardware but a program running on the computer can't. You can use programs but hopefully will never have to access the hardware or the more complex parts of the operating system such as drivers. This again reduces the complexity of the system because each layer only needs to know about the layer directly below it, not any others.
-</p>
-<p>
- Each layer in the system needs to provide an interface so that the layer above it can communicate with it. For example, a processor provides a set of instructions to the operating system; the operating system provides commands to programs to create or delete files on the hard drive; a program provides buttons and commands so that you can interact with it.
-</p>
-<p>
- One layer knows nothing about the internal workings of the layer below; it only needs to know how to use the layer&rsquo;s interface. In this way, the complexity of lower layers is completely hidden, or
- <em>
-  abstracted
- </em>
- . Each layer represents a higher level of abstraction.
-</p>
-<p>
- So each layer hides some complexity, so that as we go up the layers things remain manageable. Another advantage of having layers is that we can change one layer without affecting the others, as long as we keep the layer&rsquo;s interface the same of course. For example, your browser&rsquo;s code might change but you might never notice as long as the browser still looks and works the same as before. Of course, if the browser stops working or new buttons appear suddenly you know that something has changed.
-</p>
-<p>
- Something about a button or more explicitly a button-link that you should not match.
-</p>
+<p>Finally, you’re the top layer of the system. You use the program but you will (hopefully) never have to interact with the more complicated parts of the operating system such as driver software, let alone the hardware. In this way, you can use the computer without ever having to worry about these things.</p>
+<p>{image filename="computer-layers.png" alt="The computer can be broken down into multiple layers, starting with the user, then the programs, then the operating system, then finally the hardware." caption="The computer can be broken down into multiple layers, starting with the user, then the programs, then the operating system, then finally the hardware."}</p>
+<p>We call a system like this a <em>layered system</em>. You can have any number of layers you want but each layer can only communicate with the one directly below it. The operating system can directly access the hardware but a program running on the computer can't. You can use programs but hopefully will never have to access the hardware or the more complex parts of the operating system such as drivers. This again reduces the complexity of the system because each layer only needs to know about the layer directly below it, not any others.</p>
+<p>Each layer in the system needs to provide an interface so that the layer above it can communicate with it. For example, a processor provides a set of instructions to the operating system; the operating system provides commands to programs to create or delete files on the hard drive; a program provides buttons and commands so that you can interact with it.</p>
+<p>One layer knows nothing about the internal workings of the layer below; it only needs to know how to use the layer’s interface. In this way, the complexity of lower layers is completely hidden, or <em>abstracted</em>. Each layer represents a higher level of abstraction.</p>
+<p>So each layer hides some complexity, so that as we go up the layers things remain manageable. Another advantage of having layers is that we can change one layer without affecting the others, as long as we keep the layer’s interface the same of course. For example, your browser’s code might change but you might never notice as long as the browser still looks and works the same as before. Of course, if the browser stops working or new buttons appear suddenly you know that something has changed.</p>
+<p>Something about a button or more explicitly a button-link that you should not match.</p>
diff --git a/verto/tests/assets/comment/comment_contains_comment_expected.html b/verto/tests/assets/comment/comment_contains_comment_expected.html
index 40995fc7..d41ea925 100644
--- a/verto/tests/assets/comment/comment_contains_comment_expected.html
+++ b/verto/tests/assets/comment/comment_contains_comment_expected.html
@@ -1,3 +1 @@
-<p>
- {comment explain different views of algorithm (programming context) and Algorithm (that have interesting complexity) {comment explain different views of algorithm (programming context) and Algorithm (that have interesting complexity)}}
-</p>
+<p>{comment explain different views of algorithm (programming context) and Algorithm (that have interesting complexity) {comment explain different views of algorithm (programming context) and Algorithm (that have interesting complexity)}}</p>
diff --git a/verto/tests/assets/comment/comment_within_block_container_expected.html b/verto/tests/assets/comment/comment_within_block_container_expected.html
index 4fc569d0..aab01af9 100644
--- a/verto/tests/assets/comment/comment_within_block_container_expected.html
+++ b/verto/tests/assets/comment/comment_within_block_container_expected.html
@@ -1,12 +1,8 @@
 <div class="panel panel-lipsum">
- <div class="panel-header">
-  <strong>
-   Lipsum Lorem
-  </strong>
- </div>
- <div class="panel-body">
-  <p>
-   Should be the only text left.
-  </p>
- </div>
+<div class="panel-header">
+<strong>Lipsum Lorem</strong>
+</div>
+<div class="panel-body">
+<p>Should be the only text left.</p>
+</div>
 </div>
diff --git a/verto/tests/assets/comment/contains_multiple_inline_comments_expected.html b/verto/tests/assets/comment/contains_multiple_inline_comments_expected.html
index d439a9c9..5121572f 100644
--- a/verto/tests/assets/comment/contains_multiple_inline_comments_expected.html
+++ b/verto/tests/assets/comment/contains_multiple_inline_comments_expected.html
@@ -1,3 +1 @@
-<p>
- Some intermediary text.
-</p>
+<p>Some intermediary text.</p>
diff --git a/verto/tests/assets/comment/doc_example_multiple_usage_expected.html b/verto/tests/assets/comment/doc_example_multiple_usage_expected.html
index 76d9ed49..7c6dc546 100644
--- a/verto/tests/assets/comment/doc_example_multiple_usage_expected.html
+++ b/verto/tests/assets/comment/doc_example_multiple_usage_expected.html
@@ -1,9 +1,3 @@
-<p>
- Finally add a teaspoon of salt and tumeric.
-</p>
-<p>
- Combine and mix ingredients in a large bowl.
-</p>
-<p>
- Bake at 180C for 40 minutes.
-</p>
+<p>Finally add a teaspoon of salt and tumeric.</p>
+<p>Combine and mix ingredients in a large bowl.</p>
+<p>Bake at 180C for 40 minutes.</p>
diff --git a/verto/tests/assets/comment/no_inline_comment_expected.html b/verto/tests/assets/comment/no_inline_comment_expected.html
index 0112f398..fa9fcac2 100644
--- a/verto/tests/assets/comment/no_inline_comment_expected.html
+++ b/verto/tests/assets/comment/no_inline_comment_expected.html
@@ -1,8 +1,4 @@
-<p>
- In this chapter we'll look at what typically makes good and bad interfaces. The idea is to make you sensitive to the main issues so that you can critique existing interfaces, and begin to think about how you might design good interfaces.
-</p>
-<p>
- Often software developers create a computer program or system for a device that requires the user to spend some time to learn how to use.
+<p>In this chapter we'll look at what typically makes good and bad interfaces. The idea is to make you sensitive to the main issues so that you can critique existing interfaces, and begin to think about how you might design good interfaces.</p>
+<p>Often software developers create a computer program or system for a device that requires the user to spend some time to learn how to use.
 The interface might be easy to use for the developer since they know the system really well, but a user just wants to get the job done without spending too much time learning the software (and they might switch to another program if it's too hard to use).
-A developer might think of the program and the user separately, but the user is part of the system, and a developer needs to create the software with the user in mind, designing a program that they will find easy to use and intuitive.
-</p>
+A developer might think of the program and the user separately, but the user is part of the system, and a developer needs to create the software with the user in mind, designing a program that they will find easy to use and intuitive.</p>
diff --git a/verto/tests/assets/comment/text_contains_the_word_comment_expected.html b/verto/tests/assets/comment/text_contains_the_word_comment_expected.html
index 10936821..cde827f1 100644
--- a/verto/tests/assets/comment/text_contains_the_word_comment_expected.html
+++ b/verto/tests/assets/comment/text_contains_the_word_comment_expected.html
@@ -1,17 +1,7 @@
-<p>
- Now go back and have another conversation with Eliza. There are many other examples of Eliza saying stuff that makes no sense such as the above dialogue. How many can you find? In addition, how does Eliza respond when you do the following things?
-</p>
+<p>Now go back and have another conversation with Eliza. There are many other examples of Eliza saying stuff that makes no sense such as the above dialogue. How many can you find? In addition, how does Eliza respond when you do the following things?</p>
 <ul>
- <li>
-  Try being a "parrot" that just copies everything Eliza says.
- </li>
- <li>
-  What happens when you don&rsquo;t give meaningful answers to her questions?
- </li>
- <li>
-  If you say the same thing you said earlier in the conversation, does Eliza always respond in the same way? (When you say it immediately after, she probably won&rsquo;t, as she&rsquo;ll comment on the fact that you repeated yourself the second time!)
- </li>
- <li>
-  What happens when you talk about things that are unrelated to what would be said in a therapy session, i.e. you try to have a general conversation with Eliza (remember that Eliza works in a restricted domain, i.e. she assumes she is a therapist).
- </li>
+<li>Try being a "parrot" that just copies everything Eliza says.</li>
+<li>What happens when you don’t give meaningful answers to her questions?</li>
+<li>If you say the same thing you said earlier in the conversation, does Eliza always respond in the same way? (When you say it immediately after, she probably won’t, as she’ll comment on the fact that you repeated yourself the second time!)</li>
+<li>What happens when you talk about things that are unrelated to what would be said in a therapy session, i.e. you try to have a general conversation with Eliza (remember that Eliza works in a restricted domain, i.e. she assumes she is a therapist).</li>
 </ul>
diff --git a/verto/tests/assets/conditional/doc_example_basic_usage_expected.html b/verto/tests/assets/conditional/doc_example_basic_usage_expected.html
index 9796b655..fda33feb 100644
--- a/verto/tests/assets/conditional/doc_example_basic_usage_expected.html
+++ b/verto/tests/assets/conditional/doc_example_basic_usage_expected.html
@@ -1,5 +1,3 @@
 {% if version == 'teacher' %}
-<p>
- This is text that only teachers should see.
-</p>
+<p>This is text that only teachers should see.</p>
 {% endif %}
diff --git a/verto/tests/assets/conditional/doc_example_complex_usage_expected.html b/verto/tests/assets/conditional/doc_example_complex_usage_expected.html
index 97cda7a1..fe747c39 100644
--- a/verto/tests/assets/conditional/doc_example_complex_usage_expected.html
+++ b/verto/tests/assets/conditional/doc_example_complex_usage_expected.html
@@ -1,17 +1,9 @@
 {% if version == 'teacher' %}
-<p>
- This is text that only teachers should see.
-</p>
+<p>This is text that only teachers should see.</p>
 {% elif version == 'instructor' %}
-<p>
- This is text that only instuctors should see.
-</p>
+<p>This is text that only instuctors should see.</p>
 {% elif version == 'coordinator' %}
-<p>
- This is text that only coordinators should see.
-</p>
+<p>This is text that only coordinators should see.</p>
 {% else %}
-<p>
- This is text that everyone else should see.
-</p>
+<p>This is text that everyone else should see.</p>
 {% endif %}
diff --git a/verto/tests/assets/conditional/doc_example_override_html_expected.html b/verto/tests/assets/conditional/doc_example_override_html_expected.html
index b2058613..581406d2 100644
--- a/verto/tests/assets/conditional/doc_example_override_html_expected.html
+++ b/verto/tests/assets/conditional/doc_example_override_html_expected.html
@@ -1,13 +1,7 @@
 % if version == 'teacher':
-<p>
- This is text that only teachers should see.
-</p>
+<p>This is text that only teachers should see.</p>
 % elif version == 'instructor':
-<p>
- This is text that only instuctors should see.
-</p>
+<p>This is text that only instuctors should see.</p>
 % elif version == 'coordinator':
-<p>
- This is text that only coordinators should see.
-</p>
+<p>This is text that only coordinators should see.</p>
 % endif
diff --git a/verto/tests/assets/conditional/example_basic_else_usage_expected.html b/verto/tests/assets/conditional/example_basic_else_usage_expected.html
index 9c5330df..ee818a9e 100644
--- a/verto/tests/assets/conditional/example_basic_else_usage_expected.html
+++ b/verto/tests/assets/conditional/example_basic_else_usage_expected.html
@@ -1,9 +1,5 @@
 {% if version == 'teacher' %}
-<p>
- This is text that only teachers should see.
-</p>
+<p>This is text that only teachers should see.</p>
 {% else %}
-<p>
- This is text that everyone else should see.
-</p>
+<p>This is text that everyone else should see.</p>
 {% endif %}
diff --git a/verto/tests/assets/conditional/example_elif_no_else_expected.html b/verto/tests/assets/conditional/example_elif_no_else_expected.html
index 3d6a8c65..ef1ecaac 100644
--- a/verto/tests/assets/conditional/example_elif_no_else_expected.html
+++ b/verto/tests/assets/conditional/example_elif_no_else_expected.html
@@ -1,5 +1,5 @@
 <script>
- if (version == 'teacher') {
+if (version == 'teacher') {
   return """<p>This is text that only teachers should see.</p>""";
 }
 else if (version == 'instructor') {
diff --git a/verto/tests/assets/conditional/example_single_elif_expected.html b/verto/tests/assets/conditional/example_single_elif_expected.html
index 6ac6ab2d..46521cf5 100644
--- a/verto/tests/assets/conditional/example_single_elif_expected.html
+++ b/verto/tests/assets/conditional/example_single_elif_expected.html
@@ -1,9 +1,5 @@
 {% if version == 'teacher' %}
-<p>
- This is text that only teachers should see.
-</p>
+<p>This is text that only teachers should see.</p>
 {% elif version == 'instructor' %}
-<p>
- This is text that only instuctors should see.
-</p>
+<p>This is text that only instuctors should see.</p>
 {% endif %}
diff --git a/verto/tests/assets/configuration/all_processors_custom_html_expected.html b/verto/tests/assets/configuration/all_processors_custom_html_expected.html
index e92cf049..5c2190d4 100644
--- a/verto/tests/assets/configuration/all_processors_custom_html_expected.html
+++ b/verto/tests/assets/configuration/all_processors_custom_html_expected.html
@@ -1,80 +1,43 @@
 <h1 id="example-title">
- <span class="section_number">
-  {{ chapter.number }}.
- </span>
- Example Title
+<span class="section_number">
+{{ chapter.number }}.
+</span>
+Example Title
 </h1>
-<p>
- This is a sentence.
-</p>
+<p>This is a sentence.</p>
 <h1 id="example-title-2">
- <span class="section_number">
-  {{ chapter.number }}.
- </span>
- Example Title 2
+<span class="section_number">
+{{ chapter.number }}.
+</span>
+Example Title 2
 </h1>
-<p>
- Check out this
- <a href="{{ base_path }}resource/134">
-  resource
- </a>
- .
-</p>
+<p>Check out this <a href="{{ base_path }}resource/134">resource</a>.</p>
 <div class="panel panel-teacher-note">
- <div class="panel-header">
-  <strong>
-   Teacher Note:
-  </strong>
-  Guides for Algorithms
- </div>
- <div class="panel-body">
-  <p>
-   This text is the panel's contents.
-  </p>
- </div>
+<div class="panel-header">
+<strong>Teacher Note:</strong> Guides for Algorithms
 </div>
-<img class="test"/>
-<div class="box">
- <p>
-  <strong>
-   Computer Science Report for 2.44
-  </strong>
- </p>
- <p>
-  Put your introduction to what bits are here.
- </p>
+<div class="panel-body">
+<p>This text is the panel's contents.</p>
 </div>
-<a class="button" href="http://www.google.com">
- Visit Google
-</a>
-{% if version == 'teacher' %}
-<p>
- This is text that only teachers should see.
-</p>
+</div>
+<img class="test" /><div class="box">
+<p><strong>Computer Science Report for 2.44</strong></p>
+<p>Put your introduction to what bits are here.</p>
+</div>
+<a class="button" href="http://www.google.com">Visit Google</a>{% if version == 'teacher' %}
+<p>This is text that only teachers should see.</p>
 {% endif %}
-<p>
- It's worth considering which
- <a class="glossary-term" data-glossary-term="algorithm">
-  algorithms
- </a>
- should be used.
-</p>
+<p>It's worth considering which <a class="glossary-term" data-glossary-term="algorithm">algorithms</a> should be used.</p>
 <iframe src="https://github.com/">
- <p>
-  Your browser does not support iframes.
- </p>
+<p>Your browser does not support iframes.</p>
 </iframe>
 <iframe src="{% url 'interactive' name='binary-cards' %}?digits=5&amp;start=BBBBB">
- <p>
-  Your browser does not support iframes.
- </p>
+<p>Your browser does not support iframes.</p>
 </iframe>
 <div class="scratch-inline-images">
- <object data="{% static 'scratch-blocks-a0f8fcad796864abfacac8bda6e0719813833fd1fca348700abbd040557c1576.svg' %}" type="image/svg+xml">
- </object>
-</div>
-{{ table_of_contents }}
+<object data="{% static 'scratch-blocks-a0f8fcad796864abfacac8bda6e0719813833fd1fca348700abbd040557c1576.svg' %}" type="image/svg+xml">
+</object>
+</div>{{ table_of_contents }}
 <div>
- <iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/dQw4w9WgXcQ?rel=0">
- </iframe>
+<iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/dQw4w9WgXcQ?rel=0"></iframe>
 </div>
diff --git a/verto/tests/assets/configuration/all_processors_except_comment_expected.html b/verto/tests/assets/configuration/all_processors_except_comment_expected.html
index c786864b..7e832970 100644
--- a/verto/tests/assets/configuration/all_processors_except_comment_expected.html
+++ b/verto/tests/assets/configuration/all_processors_except_comment_expected.html
@@ -1,93 +1,49 @@
 <h1 id="example-title">
- <span class="section_number">
-  {{ chapter.number }}.
- </span>
- Example Title
+<span class="section_number">
+{{ chapter.number }}.
+</span>
+Example Title
 </h1>
-<p>
- This is a sentence.
-</p>
+<p>This is a sentence.</p>
 <h1 id="example-title-2">
- <span class="section_number">
-  {{ chapter.number }}.
- </span>
- Example Title 2
+<span class="section_number">
+{{ chapter.number }}.
+</span>
+Example Title 2
 </h1>
-<p>
- {comment This is a comment for other authors to read}
-</p>
-<p>
- Check out this
- <a href="{{ base_path }}resource/134">
-  resource
- </a>
- .
-</p>
+<p>{comment This is a comment for other authors to read}</p>
+<p>Check out this <a href="{{ base_path }}resource/134">resource</a>.</p>
 <div class="panel panel-teacher-note">
- <div class="panel-header">
-  <strong>
-   Teacher Note:
-  </strong>
-  Guides for Algorithms
- </div>
- <div class="panel-body">
-  <p>
-   This text is the panel's contents.
-  </p>
- </div>
+<div class="panel-header">
+<strong>Teacher Note:</strong> Guides for Algorithms
+</div>
+<div class="panel-body">
+<p>This text is the panel's contents.</p>
+</div>
 </div>
 <div>
- <img class="left-align" src="http://placehold.it/350x150" title="This is hover text"/>
- <p>
-  Placeholder image
- </p>
- <p>
-  <a href="https://placehold.it/">
-   Source
-  </a>
- </p>
+<img class="left-align" src="http://placehold.it/350x150" title="This is hover text" />
+<p>Placeholder image</p>
+<p><a href="https://placehold.it/">Source</a></p>
 </div>
 <div class="boxed-text">
- <p>
-  <strong>
-   Computer Science Report for 2.44
-  </strong>
- </p>
- <p>
-  Put your introduction to what bits are here.
- </p>
+<p><strong>Computer Science Report for 2.44</strong></p>
+<p>Put your introduction to what bits are here.</p>
 </div>
-<a class="button" href="http://www.google.com">
- Visit Google
-</a>
-{% if version == 'teacher' %}
-<p>
- This is text that only teachers should see.
-</p>
+<a class="button" href="http://www.google.com">Visit Google</a>{% if version == 'teacher' %}
+<p>This is text that only teachers should see.</p>
 {% endif %}
-<p>
- It's worth considering which
- <a class="glossary-term" data-glossary-term="algorithm">
-  algorithms
- </a>
- should be used.
-</p>
+<p>It's worth considering which <a class="glossary-term" data-glossary-term="algorithm">algorithms</a> should be used.</p>
 <iframe src="https://github.com/">
- <p>
-  Your browser does not support iframes.
- </p>
+<p>Your browser does not support iframes.</p>
 </iframe>
 <iframe src="{% url 'interactive' name='binary-cards' %}?digits=5&amp;start=BBBBB">
- <p>
-  Your browser does not support iframes.
- </p>
+<p>Your browser does not support iframes.</p>
 </iframe>
 <div class="scratch-inline-images">
- <object data="{% static 'scratch-blocks-a0f8fcad796864abfacac8bda6e0719813833fd1fca348700abbd040557c1576.svg' %}" type="image/svg+xml">
- </object>
-</div>
-{{ table_of_contents }}
+<object data="{% static 'scratch-blocks-a0f8fcad796864abfacac8bda6e0719813833fd1fca348700abbd040557c1576.svg' %}" type="image/svg+xml">
+</object>
+</div>{{ table_of_contents }}
 <div>
- <iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/dQw4w9WgXcQ?rel=0">
- </iframe>
+<iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/dQw4w9WgXcQ?rel=0"></iframe>
 </div>
diff --git a/verto/tests/assets/configuration/all_processors_expected.html b/verto/tests/assets/configuration/all_processors_expected.html
index b747d267..760895c5 100644
--- a/verto/tests/assets/configuration/all_processors_expected.html
+++ b/verto/tests/assets/configuration/all_processors_expected.html
@@ -1,90 +1,48 @@
 <h1 id="example-title">
- <span class="section_number">
-  {{ chapter.number }}.
- </span>
- Example Title
+<span class="section_number">
+{{ chapter.number }}.
+</span>
+Example Title
 </h1>
-<p>
- This is a sentence.
-</p>
+<p>This is a sentence.</p>
 <h1 id="example-title-2">
- <span class="section_number">
-  {{ chapter.number }}.
- </span>
- Example Title 2
+<span class="section_number">
+{{ chapter.number }}.
+</span>
+Example Title 2
 </h1>
-<p>
- Check out this
- <a href="{{ base_path }}resource/134">
-  resource
- </a>
- .
-</p>
+<p>Check out this <a href="{{ base_path }}resource/134">resource</a>.</p>
 <div class="panel panel-teacher-note">
- <div class="panel-header">
-  <strong>
-   Teacher Note:
-  </strong>
-  Guides for Algorithms
- </div>
- <div class="panel-body">
-  <p>
-   This text is the panel's contents.
-  </p>
- </div>
+<div class="panel-header">
+<strong>Teacher Note:</strong> Guides for Algorithms
+</div>
+<div class="panel-body">
+<p>This text is the panel's contents.</p>
+</div>
 </div>
 <div>
- <img class="left-align" src="http://placehold.it/350x150" title="This is hover text"/>
- <p>
-  Placeholder image
- </p>
- <p>
-  <a href="https://placehold.it/">
-   Source
-  </a>
- </p>
+<img class="left-align" src="http://placehold.it/350x150" title="This is hover text" />
+<p>Placeholder image</p>
+<p><a href="https://placehold.it/">Source</a></p>
 </div>
 <div class="boxed-text">
- <p>
-  <strong>
-   Computer Science Report for 2.44
-  </strong>
- </p>
- <p>
-  Put your introduction to what bits are here.
- </p>
+<p><strong>Computer Science Report for 2.44</strong></p>
+<p>Put your introduction to what bits are here.</p>
 </div>
-<a class="button" href="http://www.google.com">
- Visit Google
-</a>
-{% if version == 'teacher' %}
-<p>
- This is text that only teachers should see.
-</p>
+<a class="button" href="http://www.google.com">Visit Google</a>{% if version == 'teacher' %}
+<p>This is text that only teachers should see.</p>
 {% endif %}
-<p>
- It's worth considering which
- <a class="glossary-term" data-glossary-term="algorithm">
-  algorithms
- </a>
- should be used.
-</p>
+<p>It's worth considering which <a class="glossary-term" data-glossary-term="algorithm">algorithms</a> should be used.</p>
 <iframe src="https://github.com/">
- <p>
-  Your browser does not support iframes.
- </p>
+<p>Your browser does not support iframes.</p>
 </iframe>
 <iframe src="{% url 'interactive' name='binary-cards' %}?digits=5&amp;start=BBBBB">
- <p>
-  Your browser does not support iframes.
- </p>
+<p>Your browser does not support iframes.</p>
 </iframe>
 <div class="scratch-inline-images">
- <object data="{% static 'scratch-blocks-a0f8fcad796864abfacac8bda6e0719813833fd1fca348700abbd040557c1576.svg' %}" type="image/svg+xml">
- </object>
-</div>
-{{ table_of_contents }}
+<object data="{% static 'scratch-blocks-a0f8fcad796864abfacac8bda6e0719813833fd1fca348700abbd040557c1576.svg' %}" type="image/svg+xml">
+</object>
+</div>{{ table_of_contents }}
 <div>
- <iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/dQw4w9WgXcQ?rel=0">
- </iframe>
+<iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/dQw4w9WgXcQ?rel=0"></iframe>
 </div>
diff --git a/verto/tests/assets/configuration/custom_processors_custom_templates_expected.html b/verto/tests/assets/configuration/custom_processors_custom_templates_expected.html
index 1c8eee76..d10198a7 100644
--- a/verto/tests/assets/configuration/custom_processors_custom_templates_expected.html
+++ b/verto/tests/assets/configuration/custom_processors_custom_templates_expected.html
@@ -1,63 +1,22 @@
-<h1>
- Example Title
-</h1>
-<p>
- This is a sentence.
-</p>
-<h1>
- Example Title 2
-</h1>
-<p>
- {comment This is a comment for other authors to read}
-</p>
-<p>
- Check out this
- <a href="resource/134">
-  resource
- </a>
- .
-</p>
-<p>
- {panel type="teacher-note" title="Teacher Note" subtitle="Guides for Algorithms"}
-</p>
-<p>
- This text is the panel's contents.
-</p>
-<p>
- {panel end}
-</p>
-<img class="test"/>
-<div class="box">
- <p>
-  <strong>
-   Computer Science Report for 2.44
-  </strong>
- </p>
- <p>
-  Put your introduction to what bits are here.
- </p>
+<h1>Example Title</h1>
+<p>This is a sentence.</p>
+<h1>Example Title 2</h1>
+<p>{comment This is a comment for other authors to read}</p>
+<p>Check out this <a href="resource/134">resource</a>.</p>
+<p>{panel type="teacher-note" title="Teacher Note" subtitle="Guides for Algorithms"}</p>
+<p>This text is the panel's contents.</p>
+<p>{panel end}</p>
+<img class="test" /><div class="box">
+<p><strong>Computer Science Report for 2.44</strong></p>
+<p>Put your introduction to what bits are here.</p>
 </div>
-<p>
- {button-link link="http://www.google.com" text="Visit Google"}
-</p>
-<p>
- {conditional if condition="version == 'teacher'"}
-</p>
-<p>
- This is text that only teachers should see.
-</p>
-<p>
- {conditional end}
-</p>
-<p>
- It's worth considering which {glossary-link term="algorithm"}algorithms{glossary-link end} should be used.
-</p>
-<p>
- {iframe link="https://github.com/"}
-</p>
-<p>
- {interactive name="binary-cards" type="iframe" parameters="digits=5&amp;start=BBBBB"}
-</p>
+<p>{button-link link="http://www.google.com" text="Visit Google"}</p>
+<p>{conditional if condition="version == 'teacher'"}</p>
+<p>This is text that only teachers should see.</p>
+<p>{conditional end}</p>
+<p>It's worth considering which {glossary-link term="algorithm"}algorithms{glossary-link end} should be used.</p>
+<p>{iframe link="https://github.com/"}</p>
+<p>{interactive name="binary-cards" type="iframe" parameters="digits=5&amp;start=BBBBB"}</p>
 <pre><code>scratch
 when flag clicked
 clear
@@ -71,9 +30,5 @@ <h1>
 move (foo) steps
 turn ccw (9) degrees
 </code></pre>
-<p>
- {table-of-contents}
-</p>
-<p>
- {video url="https://www.youtube.com/watch?v=dQw4w9WgXcQ"}
-</p>
+<p>{table-of-contents}</p>
+<p>{video url="https://www.youtube.com/watch?v=dQw4w9WgXcQ"}</p>
diff --git a/verto/tests/assets/configuration/custom_processors_expected.html b/verto/tests/assets/configuration/custom_processors_expected.html
index 498a46ed..21a4ddbb 100644
--- a/verto/tests/assets/configuration/custom_processors_expected.html
+++ b/verto/tests/assets/configuration/custom_processors_expected.html
@@ -1,81 +1,32 @@
-<h1>
- Example Title
-</h1>
-<p>
- This is a sentence.
-</p>
-<h1>
- Example Title 2
-</h1>
-<p>
- {comment This is a comment for other authors to read}
-</p>
-<p>
- Check out this
- <a href="resource/134">
-  resource
- </a>
- .
-</p>
+<h1>Example Title</h1>
+<p>This is a sentence.</p>
+<h1>Example Title 2</h1>
+<p>{comment This is a comment for other authors to read}</p>
+<p>Check out this <a href="resource/134">resource</a>.</p>
 <div class="panel panel-teacher-note">
- <div class="panel-header">
-  <strong>
-   Teacher Note:
-  </strong>
-  Guides for Algorithms
- </div>
- <div class="panel-body">
-  <p>
-   This text is the panel's contents.
-  </p>
- </div>
+<div class="panel-header">
+<strong>Teacher Note:</strong> Guides for Algorithms
+</div>
+<div class="panel-body">
+<p>This text is the panel's contents.</p>
+</div>
 </div>
 <div>
- <img class="left-align" src="http://placehold.it/350x150" title="This is hover text"/>
- <p>
-  Placeholder image
- </p>
- <p>
-  <a href="https://placehold.it/">
-   Source
-  </a>
- </p>
+<img class="left-align" src="http://placehold.it/350x150" title="This is hover text" />
+<p>Placeholder image</p>
+<p><a href="https://placehold.it/">Source</a></p>
 </div>
-<p>
- {boxed-text}
-</p>
-<p>
- <strong>
-  Computer Science Report for 2.44
- </strong>
-</p>
-<p>
- Put your introduction to what bits are here.
-</p>
-<p>
- {boxed-text end}
-</p>
-<p>
- {button-link link="http://www.google.com" text="Visit Google"}
-</p>
-<p>
- {conditional if condition="version == 'teacher'"}
-</p>
-<p>
- This is text that only teachers should see.
-</p>
-<p>
- {conditional end}
-</p>
-<p>
- It's worth considering which {glossary-link term="algorithm"}algorithms{glossary-link end} should be used.
-</p>
-<p>
- {iframe link="https://github.com/"}
-</p>
-<p>
- {interactive name="binary-cards" type="iframe" parameters="digits=5&amp;start=BBBBB"}
-</p>
+<p>{boxed-text}</p>
+<p><strong>Computer Science Report for 2.44</strong></p>
+<p>Put your introduction to what bits are here.</p>
+<p>{boxed-text end}</p>
+<p>{button-link link="http://www.google.com" text="Visit Google"}</p>
+<p>{conditional if condition="version == 'teacher'"}</p>
+<p>This is text that only teachers should see.</p>
+<p>{conditional end}</p>
+<p>It's worth considering which {glossary-link term="algorithm"}algorithms{glossary-link end} should be used.</p>
+<p>{iframe link="https://github.com/"}</p>
+<p>{interactive name="binary-cards" type="iframe" parameters="digits=5&amp;start=BBBBB"}</p>
 <pre><code>scratch
 when flag clicked
 clear
@@ -89,9 +40,5 @@ <h1>
 move (foo) steps
 turn ccw (9) degrees
 </code></pre>
-<p>
- {table-of-contents}
-</p>
-<p>
- {video url="https://www.youtube.com/watch?v=dQw4w9WgXcQ"}
-</p>
+<p>{table-of-contents}</p>
+<p>{video url="https://www.youtube.com/watch?v=dQw4w9WgXcQ"}</p>
diff --git a/verto/tests/assets/configuration/multiline_templates_expected.html b/verto/tests/assets/configuration/multiline_templates_expected.html
index 03895b19..6ecd7608 100644
--- a/verto/tests/assets/configuration/multiline_templates_expected.html
+++ b/verto/tests/assets/configuration/multiline_templates_expected.html
@@ -1,84 +1,48 @@
 <h1 id="example-title">
- <span class="section_number">
-  1.0.0.0.0.0.
- </span>
- Example Title
+<span class="section_number">
+1.0.0.0.0.0.
+</span>
+Example Title
 </h1>
-<p>
- This is a sentence.
-</p>
+<p>This is a sentence.</p>
 <h1 id="example-title-2">
- <span class="section_number">
-  2.0.0.0.0.0.
- </span>
- Example Title 2
+<span class="section_number">
+2.0.0.0.0.0.
+</span>
+Example Title 2
 </h1>
-<p>
- Check out this
- <a href="{{ base_path }}resource/134">
-  resource
- </a>
- .
-</p>
+<p>Check out this <a href="{{ base_path }}resource/134">resource</a>.</p>
 <div class="panel panel-teacher-note">
- <div class="panel-header">
-  <strong>
-   Teacher Note:
-  </strong>
-  Guides for Algorithms
- </div>
- <div class="panel-body">
-  <p>
-   This text is the panel's contents.
-  </p>
- </div>
+<div class="panel-header">
+<strong>Teacher Note:</strong> Guides for Algorithms
+</div>
+<div class="panel-body">
+<p>This text is the panel's contents.</p>
+</div>
 </div>
 <div class="text-center">
- <img class="rounded img-thumbnail" src="http://placehold.it/350x150"/>
+<img class="rounded img-thumbnail" src="http://placehold.it/350x150" />
 </div>
 <div class="card">
- <div class="card-block">
-  <p>
-   <strong>
-    Computer Science Report for 2.44
-   </strong>
-  </p>
-  <p>
-   Put your introduction to what bits are here.
-  </p>
- </div>
+<div class="card-block">
+<p><strong>Computer Science Report for 2.44</strong></p>
+<p>Put your introduction to what bits are here.</p>
 </div>
-<a class="button" href="http://www.google.com">
- Visit Google
-</a>
-{% if version == 'teacher' %}
-<p>
- This is text that only teachers should see.
-</p>
+</div>
+<a class="button" href="http://www.google.com">Visit Google</a>{% if version == 'teacher' %}
+<p>This is text that only teachers should see.</p>
 {% endif %}
-<p>
- It's worth considering which
- <a class="glossary-term" data-glossary-term="algorithm">
-  algorithms
- </a>
- should be used.
-</p>
+<p>It's worth considering which <a class="glossary-term" data-glossary-term="algorithm">algorithms</a> should be used.</p>
 <iframe src="https://github.com/">
- <p>
-  Your browser does not support iframes.
- </p>
+<p>Your browser does not support iframes.</p>
 </iframe>
 <iframe src="{% url 'interactive' name='binary-cards' %}?digits=5&amp;start=BBBBB">
- <p>
-  Your browser does not support iframes.
- </p>
+<p>Your browser does not support iframes.</p>
 </iframe>
 <div class="scratch-inline-images">
- <object data="{% static 'scratch-blocks-a0f8fcad796864abfacac8bda6e0719813833fd1fca348700abbd040557c1576.svg' %}" type="image/svg+xml">
- </object>
-</div>
-{{ table_of_contents }}
+<object data="{% static 'scratch-blocks-a0f8fcad796864abfacac8bda6e0719813833fd1fca348700abbd040557c1576.svg' %}" type="image/svg+xml">
+</object>
+</div>{{ table_of_contents }}
 <div>
- <iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/dQw4w9WgXcQ?rel=0">
- </iframe>
+<iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/dQw4w9WgXcQ?rel=0"></iframe>
 </div>
diff --git a/verto/tests/assets/configuration/some_processors_2_expected.html b/verto/tests/assets/configuration/some_processors_2_expected.html
index 639fa01d..a5e37f5e 100644
--- a/verto/tests/assets/configuration/some_processors_2_expected.html
+++ b/verto/tests/assets/configuration/some_processors_2_expected.html
@@ -1,65 +1,33 @@
 <h1 id="another-example-title">
- <span class="section_number">
-  {{ chapter.number }}.
- </span>
- Another Example Title
+<span class="section_number">
+{{ chapter.number }}.
+</span>
+Another Example Title
 </h1>
 <div>
- <img class="" src="{% static 'totally-legit-image.png' %}"/>
+<img class="" src="{% static 'totally-legit-image.png' %}"/>
 </div>
-<p>
- This is a sentence.
-</p>
-<p>
- Here's another FSA to consider:
-</p>
+<p>This is a sentence.</p>
+<p>Here's another FSA to consider:</p>
 <div>
- <img alt="FSA with missing transitions" class="" src="{% static 'finite-state-automata-no-trap-example.png' %}"/>
+<img alt="FSA with missing transitions" class="" src="{% static 'finite-state-automata-no-trap-example.png' %}"/>
 </div>
-<p>
- It's fairly clear what it will accept: strings like "ab", "abab", "abababababab", and, of course {math}\epsilon{math end}.
+<p>It's fairly clear what it will accept: strings like "ab", "abab", "abababababab", and, of course {math}\epsilon{math end}.
 But there are some missing transitions: if you are in state 1 and get a "b" there's nowhere to go.
-If an input cannot be accepted, it will be rejected, as in this case. We could have put in a trap state to make this clear:
-</p>
+If an input cannot be accepted, it will be rejected, as in this case. We could have put in a trap state to make this clear:</p>
 <div>
- <img alt="FSA with missing transitions" class="" src="{% static 'finite-state-automata-trap-added-example.png' %}"/>
+<img alt="FSA with missing transitions" class="" src="{% static 'finite-state-automata-trap-added-example.png' %}"/>
 </div>
-<p>
- But things can get out of hand. What if there are more letters in the alphabet? We'd need something like this:
-</p>
+<p>But things can get out of hand. What if there are more letters in the alphabet? We'd need something like this:</p>
 <div>
- <img alt="FSA with missing transitions" class="" src="{% static 'finite-state-automata-trap-added-extreme-example.png' %}"/>
+<img alt="FSA with missing transitions" class="" src="{% static 'finite-state-automata-trap-added-extreme-example.png' %}"/>
 </div>
-<p>
- So, instead, we just say that any unspecified transition causes the input to be rejected (that is, it behaves as though it goes into a trap state). In other words, it's fine to use the simple version above, with just two transitions.
-</p>
-<p>
- <a class="glossary-term" data-glossary-term="hello">
- </a>
-</p>
-<p>
- The most precise way of giving a set of instructions is in the form of a
- <a class="glossary-term" data-glossary-term="algorithm" id="glossary-algorithm">
-  program
- </a>
- ,
-which is a specific implementation of an algorithm, written in a specific programming language, with a very specific result for any particular input.
-</p>
-<p>
- Because algorithms exist even if they aren't turned in to programs, we won't need to look at programs at all for this topic, unless you particularly want to.
-</p>
-<p>
- <a class="glossary-term" data-glossary-term="algorithm" id="glossary-algorithm-2">
- </a>
-</p>
-<p>
- They also happen to be great for illustrating some of the key concepts that arise with algorithms.
-</p>
-<p>
- <a class="glossary-term" data-glossary-term="algorithm" id="glossary-algorithm-3">
- </a>
-</p>
-<p>
- <a class="glossary-term" data-glossary-term="algorithm" id="glossary-algorithm-4">
- </a>
-</p>
+<p>So, instead, we just say that any unspecified transition causes the input to be rejected (that is, it behaves as though it goes into a trap state). In other words, it's fine to use the simple version above, with just two transitions.</p>
+<p><a class="glossary-term" data-glossary-term="hello"></a></p>
+<p>The most precise way of giving a set of instructions is in the form of a <a class="glossary-term" data-glossary-term="algorithm" id="glossary-algorithm">program</a>,
+which is a specific implementation of an algorithm, written in a specific programming language, with a very specific result for any particular input.</p>
+<p>Because algorithms exist even if they aren't turned in to programs, we won't need to look at programs at all for this topic, unless you particularly want to.</p>
+<p><a class="glossary-term" data-glossary-term="algorithm" id="glossary-algorithm-2"></a></p>
+<p>They also happen to be great for illustrating some of the key concepts that arise with algorithms.</p>
+<p><a class="glossary-term" data-glossary-term="algorithm" id="glossary-algorithm-3"></a></p>
+<p><a class="glossary-term" data-glossary-term="algorithm" id="glossary-algorithm-4"></a></p>
diff --git a/verto/tests/assets/configuration/some_processors_expected.html b/verto/tests/assets/configuration/some_processors_expected.html
index cd26134b..af54bf2d 100644
--- a/verto/tests/assets/configuration/some_processors_expected.html
+++ b/verto/tests/assets/configuration/some_processors_expected.html
@@ -1,24 +1,17 @@
 <h1 id="another-example-title">
- <span class="section_number">
-  {{ chapter.number }}.
- </span>
- Another Example Title
+<span class="section_number">
+{{ chapter.number }}.
+</span>
+Another Example Title
 </h1>
 <h2 id="this-is-an-h2">
- <span class="section_number">
-  {{ chapter.number }}.
- </span>
- This is an H2
+<span class="section_number">
+{{ chapter.number }}.
+</span>
+This is an H2
 </h2>
 <div>
- <img class="" src="{% static 'totally-legit-image.png' %}"/>
+<img class="" src="{% static 'totally-legit-image.png' %}"/>
 </div>
-<p>
- This is a sentence.
-</p>
-<p>
-<p>
- <a class="glossary-term" data-glossary-term="chomsky-hierarchy" id="glossary-chomsky-hierarchy">
-  Chomsky Hierarchy
- </a>
-</p>
+<p>This is a sentence.</p>
+<p><a class="glossary-term" data-glossary-term="chomsky-hierarchy" id="glossary-chomsky-hierarchy">Chomsky Hierarchy</a></p>
diff --git a/verto/tests/assets/glossary-link/doc_example_basic_usage_expected.html b/verto/tests/assets/glossary-link/doc_example_basic_usage_expected.html
index 5b7415ae..4a0d1916 100644
--- a/verto/tests/assets/glossary-link/doc_example_basic_usage_expected.html
+++ b/verto/tests/assets/glossary-link/doc_example_basic_usage_expected.html
@@ -1,7 +1 @@
-<p>
- It's worth considering which
- <a class="glossary-term" data-glossary-term="algorithm">
-  algorithms
- </a>
- should be used.
-</p>
+<p>It's worth considering which <a class="glossary-term" data-glossary-term="algorithm">algorithms</a> should be used.</p>
diff --git a/verto/tests/assets/glossary-link/doc_example_override_html_expected.html b/verto/tests/assets/glossary-link/doc_example_override_html_expected.html
index 1577b6fd..0b9d8c9d 100644
--- a/verto/tests/assets/glossary-link/doc_example_override_html_expected.html
+++ b/verto/tests/assets/glossary-link/doc_example_override_html_expected.html
@@ -1,7 +1 @@
-<p>
- It's worth considering which
- <a class="glossary-term" href="{{ base_path }}glossary#algorithm" id="glossary-algorithm">
-  algorithms
- </a>
- should be used.
-</p>
+<p>It's worth considering which <a class="glossary-term" href="{{ base_path }}glossary#algorithm" id="glossary-algorithm">algorithms</a> should be used.</p>
diff --git a/verto/tests/assets/glossary-link/doc_example_override_html_template.html b/verto/tests/assets/glossary-link/doc_example_override_html_template.html
index f2279b8a..7c324fa1 100644
--- a/verto/tests/assets/glossary-link/doc_example_override_html_template.html
+++ b/verto/tests/assets/glossary-link/doc_example_override_html_template.html
@@ -1,5 +1,3 @@
 <a class="glossary-term"
  href="{{ "{{ base_path }}" }}glossary#{{ term }}"
- {% if id %} id="{{ id }}" {% endif %}>
- {{ text }}
-</a>
+ {% if id %} id="{{ id }}" {% endif %}>{{ text }}</a>
diff --git a/verto/tests/assets/glossary-link/leading_and_trailing_inline_text_expected.html b/verto/tests/assets/glossary-link/leading_and_trailing_inline_text_expected.html
index 2f326ae6..e116bcbd 100644
--- a/verto/tests/assets/glossary-link/leading_and_trailing_inline_text_expected.html
+++ b/verto/tests/assets/glossary-link/leading_and_trailing_inline_text_expected.html
@@ -1,12 +1,2 @@
-<p>
- We've already had a taste of
- <a class="glossary-term" data-glossary-term="Regular expression">
-  regular expressions
- </a>
- in the
- <a href="chapters/formal-languages.html#getting-started">
-  getting started
- </a>
- section. They are just a simple way to search for things in the input, or to specify what kind of input will be accepted as legitimate.
-For example, many web scripting programs use them to check input for patterns like dates, email addresses and URLs. They've become so popular that they're now built into most programming languages.
-</p>
\ No newline at end of file
+<p>We've already had a taste of <a class="glossary-term" data-glossary-term="Regular expression">regular expressions</a> in the <a href="chapters/formal-languages.html#getting-started">getting started</a> section. They are just a simple way to search for things in the input, or to specify what kind of input will be accepted as legitimate.
+For example, many web scripting programs use them to check input for patterns like dates, email addresses and URLs. They've become so popular that they're now built into most programming languages.</p>
diff --git a/verto/tests/assets/glossary-link/leading_inline_text_expected.html b/verto/tests/assets/glossary-link/leading_inline_text_expected.html
index 0b7f7e15..7a35c748 100644
--- a/verto/tests/assets/glossary-link/leading_inline_text_expected.html
+++ b/verto/tests/assets/glossary-link/leading_inline_text_expected.html
@@ -1,11 +1 @@
-<p>
- For a fun discussion, you could have the students look at the
- <a href="http://www.cs4fn.org/linguistics/klingon.html">
-  Klingon Linguistics activity at CS4FN
- </a>
- . This page introduces the fundamentals of languages &mdash; words (the alphabet) and
- <a class="glossary-term" data-glossary-term="grammar">
-  grammar
- </a>
- (the rules of syntax). It discusses why languages are translated and how meaning can be changed by translation. It also explains why computer languages need to be translated.
-</p>
+<p>For a fun discussion, you could have the students look at the <a href="http://www.cs4fn.org/linguistics/klingon.html">Klingon Linguistics activity at CS4FN</a>. This page introduces the fundamentals of languages — words (the alphabet) and <a class="glossary-term" data-glossary-term="grammar">grammar</a> (the rules of syntax). It discusses why languages are translated and how meaning can be changed by translation. It also explains why computer languages need to be translated.</p>
diff --git a/verto/tests/assets/glossary-link/multiple_reference_text.md b/verto/tests/assets/glossary-link/multiple_reference_text.md
index a0a78dfa..17aa47b3 100644
--- a/verto/tests/assets/glossary-link/multiple_reference_text.md
+++ b/verto/tests/assets/glossary-link/multiple_reference_text.md
@@ -1,8 +1,6 @@
 {glossary-link term="hello"}{glossary-link end}
 
-The most precise way of giving a set of instructions is in the form of a
-{glossary-link term="algorithm" reference-text="computer program"}program{glossary-link end},
-which is a specific implementation of an algorithm, written in a specific programming language, with a very specific result for any particular input.
+The most precise way of giving a set of instructions is in the form of a {glossary-link term="algorithm" reference-text="computer program"}program{glossary-link end}, which is a specific implementation of an algorithm, written in a specific programming language, with a very specific result for any particular input.
 
 Because algorithms exist even if they aren't turned in to programs, we won't need to look at programs at all for this topic, unless you particularly want to.
 
diff --git a/verto/tests/assets/glossary-link/multiple_reference_text_expected.html b/verto/tests/assets/glossary-link/multiple_reference_text_expected.html
index f0d274fb..dfbfa4fb 100644
--- a/verto/tests/assets/glossary-link/multiple_reference_text_expected.html
+++ b/verto/tests/assets/glossary-link/multiple_reference_text_expected.html
@@ -1,39 +1,10 @@
-<p>
- <a class="glossary-term" data-glossary-term="hello">
- </a>
-</p>
-<p>
- The most precise way of giving a set of instructions is in the form of a
- <a class="glossary-term" data-glossary-term="algorithm" id="glossary-algorithm">
-  program
- </a>
- ,
-which is a specific implementation of an algorithm, written in a specific programming language, with a very specific result for any particular input.
-</p>
-<p>
- Because algorithms exist even if they aren't turned in to programs, we won't need to look at programs at all for this topic, unless you particularly want to.
-</p>
-<p>
- <a class="glossary-term" data-glossary-term="algorithm" id="glossary-algorithm-2">
- </a>
-</p>
-<h3>
- Algorithm cost
-</h3>
-<p>
- They also happen to be great for illustrating some of the key concepts that arise with algorithms.
-</p>
-<p>
- <a class="glossary-term" data-glossary-term="algorithm" id="glossary-algorithm-3">
- </a>
-</p>
-<h2>
- Searching
-</h2>
-<p>
- {panel end}
-</p>
-<p>
- <a class="glossary-term" data-glossary-term="algorithm" id="glossary-algorithm-4">
- </a>
-</p>
+<p><a class="glossary-term" data-glossary-term="hello"></a></p>
+<p>The most precise way of giving a set of instructions is in the form of a <a class="glossary-term" data-glossary-term="algorithm" id="glossary-algorithm">program</a>, which is a specific implementation of an algorithm, written in a specific programming language, with a very specific result for any particular input.</p>
+<p>Because algorithms exist even if they aren't turned in to programs, we won't need to look at programs at all for this topic, unless you particularly want to.</p>
+<p><a class="glossary-term" data-glossary-term="algorithm" id="glossary-algorithm-2"></a></p>
+<h3>Algorithm cost</h3>
+<p>They also happen to be great for illustrating some of the key concepts that arise with algorithms.</p>
+<p><a class="glossary-term" data-glossary-term="algorithm" id="glossary-algorithm-3"></a></p>
+<h2>Searching</h2>
+<p>{panel end}</p>
+<p><a class="glossary-term" data-glossary-term="algorithm" id="glossary-algorithm-4"></a></p>
diff --git a/verto/tests/assets/glossary-link/multiple_terms.md b/verto/tests/assets/glossary-link/multiple_terms.md
index 9e5e8157..fd813a04 100644
--- a/verto/tests/assets/glossary-link/multiple_terms.md
+++ b/verto/tests/assets/glossary-link/multiple_terms.md
@@ -1,7 +1,2 @@
-Next we examine a simple system for reading input called a
-{glossary-link term="finite-state-automaton" reference-text="Formal languages"}finite state automaton{glossary-link end},
-which --- as we'll find out later --- is closely related to
-{glossary-link term="regular-expression"}regular expressions{glossary-link end}.
-Later we'll explore the idea of
-{glossary-link term="grammar"}grammars{glossary-link end},
-another kind of formal language that can deal with more complicated forms of input.
\ No newline at end of file
+Next we examine a simple system for reading input called a {glossary-link term="finite-state-automaton" reference-text="Formal languages"}finite state automaton{glossary-link end}, which --- as we'll find out later --- is closely related to {glossary-link term="regular-expression"}regular expressions{glossary-link end}.
+Later we'll explore the idea of {glossary-link term="grammar"}grammars{glossary-link end}, another kind of formal language that can deal with more complicated forms of input.
diff --git a/verto/tests/assets/glossary-link/multiple_terms_expected.html b/verto/tests/assets/glossary-link/multiple_terms_expected.html
index 0241f993..3ceff719 100644
--- a/verto/tests/assets/glossary-link/multiple_terms_expected.html
+++ b/verto/tests/assets/glossary-link/multiple_terms_expected.html
@@ -1,18 +1,2 @@
-<p>
- Next we examine a simple system for reading input called a
- <a class="glossary-term" data-glossary-term="finite-state-automaton" id="glossary-finite-state-automaton">
-  finite state automaton
- </a>
- ,
-which --- as we'll find out later --- is closely related to
- <a class="glossary-term" data-glossary-term="regular-expression">
-  regular expressions
- </a>
- .
-Later we'll explore the idea of
- <a class="glossary-term" data-glossary-term="grammar">
-  grammars
- </a>
- ,
-another kind of formal language that can deal with more complicated forms of input.
-</p>
\ No newline at end of file
+<p>Next we examine a simple system for reading input called a <a class="glossary-term" data-glossary-term="finite-state-automaton" id="glossary-finite-state-automaton">finite state automaton</a>, which --- as we'll find out later --- is closely related to <a class="glossary-term" data-glossary-term="regular-expression">regular expressions</a>.
+Later we'll explore the idea of <a class="glossary-term" data-glossary-term="grammar">grammars</a>, another kind of formal language that can deal with more complicated forms of input.</p>
diff --git a/verto/tests/assets/glossary-link/multiple_word_term_expected.html b/verto/tests/assets/glossary-link/multiple_word_term_expected.html
index 6783fd27..4910fa88 100644
--- a/verto/tests/assets/glossary-link/multiple_word_term_expected.html
+++ b/verto/tests/assets/glossary-link/multiple_word_term_expected.html
@@ -1,9 +1,2 @@
-<p>
- <a class="glossary-term" data-glossary-term="digital-signature">
-  digital signature
- </a>
- .
-</p>
-<p>
- You could check that someone is the authentic private key holder by giving them a phrase to encrypt with their private key. You then decrypt it with the public key to check that they were able to encrypt the phrase you gave them.
-</p>
\ No newline at end of file
+<p><a class="glossary-term" data-glossary-term="digital-signature">digital signature</a>.</p>
+<p>You could check that someone is the authentic private key holder by giving them a phrase to encrypt with their private key. You then decrypt it with the public key to check that they were able to encrypt the phrase you gave them.</p>
diff --git a/verto/tests/assets/glossary-link/reference_text_given_expected.html b/verto/tests/assets/glossary-link/reference_text_given_expected.html
index 8503e5de..94bb3629 100644
--- a/verto/tests/assets/glossary-link/reference_text_given_expected.html
+++ b/verto/tests/assets/glossary-link/reference_text_given_expected.html
@@ -1,5 +1 @@
-<p>
- <a class="glossary-term" data-glossary-term="chomsky-hierarchy" id="glossary-chomsky-hierarchy">
-  Chomsky Hierarchy
- </a>
-</p>
\ No newline at end of file
+<p><a class="glossary-term" data-glossary-term="chomsky-hierarchy" id="glossary-chomsky-hierarchy">Chomsky Hierarchy</a></p>
diff --git a/verto/tests/assets/glossary-link/single_word_term_expected.html b/verto/tests/assets/glossary-link/single_word_term_expected.html
index 847d5884..52c1cfdd 100644
--- a/verto/tests/assets/glossary-link/single_word_term_expected.html
+++ b/verto/tests/assets/glossary-link/single_word_term_expected.html
@@ -1,7 +1 @@
-<p>
- A much better sorting algorithm is
- <a class="glossary-term" data-glossary-term="quicksort">
-  Quicksort!
- </a>
- (the name is a bit of a giveaway)
-</p>
\ No newline at end of file
+<p>A much better sorting algorithm is <a class="glossary-term" data-glossary-term="quicksort">Quicksort!</a> (the name is a bit of a giveaway)</p>
diff --git a/verto/tests/assets/glossary-link/trailing_inline_text_expected.html b/verto/tests/assets/glossary-link/trailing_inline_text_expected.html
index fc143301..d62a3629 100644
--- a/verto/tests/assets/glossary-link/trailing_inline_text_expected.html
+++ b/verto/tests/assets/glossary-link/trailing_inline_text_expected.html
@@ -1,7 +1,2 @@
-<p>
- <a class="glossary-term" data-glossary-term="finite state automaton">
-  finite state automaton
- </a>
- (FSA) might seem strange, but each word is quite simple.
-"Finite" just means that there is a limited number of states (such as train stations) in the map. The "state" is just as another name for the train stations we were using. "Automaton" is an old word meaning a machine that acts on its own, following simple rules (such as the cuckoo in a cuckoo clock).
-</p>
\ No newline at end of file
+<p><a class="glossary-term" data-glossary-term="finite state automaton">finite state automaton</a> (FSA) might seem strange, but each word is quite simple.
+"Finite" just means that there is a limited number of states (such as train stations) in the map. The "state" is just as another name for the train stations we were using. "Automaton" is an old word meaning a machine that acts on its own, following simple rules (such as the cuckoo in a cuckoo clock).</p>
diff --git a/verto/tests/assets/heading/doc_example_basic_usage_expected.html b/verto/tests/assets/heading/doc_example_basic_usage_expected.html
index 483f230d..c70efa56 100644
--- a/verto/tests/assets/heading/doc_example_basic_usage_expected.html
+++ b/verto/tests/assets/heading/doc_example_basic_usage_expected.html
@@ -1,18 +1,18 @@
 <h1 id="this-is-an-h1">
- <span class="section_number">
-  {{ chapter.number }}.
- </span>
- This is an H1
+<span class="section_number">
+{{ chapter.number }}.
+</span>
+This is an H1
 </h1>
 <h2 id="this-is-an-h2">
- <span class="section_number">
-  {{ chapter.number }}.1.
- </span>
- This is an H2
+<span class="section_number">
+{{ chapter.number }}.1.
+</span>
+This is an H2
 </h2>
 <h6 id="this-is-an-h6">
- <span class="section_number">
-  {{ chapter.number }}.1.0.0.0.1.
- </span>
- This is an H6
+<span class="section_number">
+{{ chapter.number }}.1.0.0.0.1.
+</span>
+This is an H6
 </h6>
diff --git a/verto/tests/assets/heading/doc_example_override_html_expected.html b/verto/tests/assets/heading/doc_example_override_html_expected.html
index 55094645..c2a7be88 100644
--- a/verto/tests/assets/heading/doc_example_override_html_expected.html
+++ b/verto/tests/assets/heading/doc_example_override_html_expected.html
@@ -1,42 +1,42 @@
 <h1 id="this-is-an-h1">
- <span class="section_number">
-  1.0.0.0.0.0.
- </span>
- This is an H1
+<span class="section_number">
+1.0.0.0.0.0.
+</span>
+This is an H1
 </h1>
 <h2 id="this-is-an-h2">
- <span class="section_number">
-  1.1.0.0.0.0.
- </span>
- This is an H2
+<span class="section_number">
+1.1.0.0.0.0.
+</span>
+This is an H2
 </h2>
 <h4 id="this-is-an-h4">
- <span class="section_number">
-  1.1.0.1.0.0.
- </span>
- This is an H4
+<span class="section_number">
+1.1.0.1.0.0.
+</span>
+This is an H4
 </h4>
 <h1 id="this-is-an-h1-2">
- <span class="section_number">
-  2.0.0.0.0.0.
- </span>
- This is an H1
+<span class="section_number">
+2.0.0.0.0.0.
+</span>
+This is an H1
 </h1>
 <h3 id="this-is-an-h3">
- <span class="section_number">
-  2.0.1.0.0.0.
- </span>
- This is an H3
+<span class="section_number">
+2.0.1.0.0.0.
+</span>
+This is an H3
 </h3>
 <h6 id="this-is-an-h6">
- <span class="section_number">
-  2.0.1.0.0.1.
- </span>
- This is an H6
+<span class="section_number">
+2.0.1.0.0.1.
+</span>
+This is an H6
 </h6>
 <h1 id="this-is-an-h1-3">
- <span class="section_number">
-  3.0.0.0.0.0.
- </span>
- This is an H1
+<span class="section_number">
+3.0.0.0.0.0.
+</span>
+This is an H1
 </h1>
diff --git a/verto/tests/assets/heading/doc_example_override_html_template.html b/verto/tests/assets/heading/doc_example_override_html_template.html
index 6feefecf..27cad6d5 100644
--- a/verto/tests/assets/heading/doc_example_override_html_template.html
+++ b/verto/tests/assets/heading/doc_example_override_html_template.html
@@ -1,6 +1,6 @@
 <{{ heading_type }} id="{{ title_slug }}">
-  <span class="section_number">
-    {{ level_1 }}.{{ level_2 }}.{{ level_3 }}.{{ level_4 }}.{{ level_5 }}.{{ level_6 }}.
-  </span>
-  {{ title }}
+<span class="section_number">
+{{ level_1 }}.{{ level_2 }}.{{ level_3 }}.{{ level_4 }}.{{ level_5 }}.{{ level_6 }}.
+</span>
+{{ title }}
 </{{ heading_type }}>
diff --git a/verto/tests/assets/heading/example_single_heading_expected.html b/verto/tests/assets/heading/example_single_heading_expected.html
index fc61ba34..4043043d 100644
--- a/verto/tests/assets/heading/example_single_heading_expected.html
+++ b/verto/tests/assets/heading/example_single_heading_expected.html
@@ -1,6 +1,6 @@
 <h1 id="heading-one">
- <span class="section_number">
-  {{ chapter.number }}.
- </span>
- Heading One
+<span class="section_number">
+{{ chapter.number }}.
+</span>
+Heading One
 </h1>
diff --git a/verto/tests/assets/heading/multiple_roots_zero_level_expected.html b/verto/tests/assets/heading/multiple_roots_zero_level_expected.html
index 413deec5..c197ed8b 100644
--- a/verto/tests/assets/heading/multiple_roots_zero_level_expected.html
+++ b/verto/tests/assets/heading/multiple_roots_zero_level_expected.html
@@ -1,42 +1,42 @@
 <h4 id="this-is-an-h4">
- <span class="section_number">
-  0.0.0.1.0.0.
- </span>
- This is an H4
+<span class="section_number">
+0.0.0.1.0.0.
+</span>
+This is an H4
 </h4>
 <h2 id="this-is-an-h2">
- <span class="section_number">
-  0.1.0.0.0.0.
- </span>
- This is an H2
+<span class="section_number">
+0.1.0.0.0.0.
+</span>
+This is an H2
 </h2>
 <h3 id="this-is-an-h3">
- <span class="section_number">
-  0.1.1.0.0.0.
- </span>
- This is an H3
+<span class="section_number">
+0.1.1.0.0.0.
+</span>
+This is an H3
 </h3>
 <h1 id="this-is-an-h1">
- <span class="section_number">
-  1.0.0.0.0.0.
- </span>
- This is an H1
+<span class="section_number">
+1.0.0.0.0.0.
+</span>
+This is an H1
 </h1>
 <h3 id="this-is-an-h3-2">
- <span class="section_number">
-  1.0.1.0.0.0.
- </span>
- This is an H3
+<span class="section_number">
+1.0.1.0.0.0.
+</span>
+This is an H3
 </h3>
 <h2 id="this-is-an-h2-2">
- <span class="section_number">
-  1.1.0.0.0.0.
- </span>
- This is an H2
+<span class="section_number">
+1.1.0.0.0.0.
+</span>
+This is an H2
 </h2>
 <h4 id="this-is-an-h4-2">
- <span class="section_number">
-  1.1.0.1.0.0.
- </span>
- This is an H4
+<span class="section_number">
+1.1.0.1.0.0.
+</span>
+This is an H4
 </h4>
diff --git a/verto/tests/assets/iframe/doc_example_basic_usage_expected.html b/verto/tests/assets/iframe/doc_example_basic_usage_expected.html
index 882daf34..5e39c55c 100644
--- a/verto/tests/assets/iframe/doc_example_basic_usage_expected.html
+++ b/verto/tests/assets/iframe/doc_example_basic_usage_expected.html
@@ -1,5 +1,3 @@
 <iframe src="http://www.google.com">
- <p>
-  Your browser does not support iframes.
- </p>
+<p>Your browser does not support iframes.</p>
 </iframe>
diff --git a/verto/tests/assets/iframe/doc_example_override_html_template.html b/verto/tests/assets/iframe/doc_example_override_html_template.html
index e0b2d2b9..a03404bd 100644
--- a/verto/tests/assets/iframe/doc_example_override_html_template.html
+++ b/verto/tests/assets/iframe/doc_example_override_html_template.html
@@ -1 +1,2 @@
-<iframe src="{{ link }}" class="embed-iframe" width="400" height="300" frameborder="0"></iframe>
+<iframe src="{{ link }}" class="embed-iframe" width="400" height="300" frameborder="0">
+</iframe>
diff --git a/verto/tests/assets/image/align_center_expected.html b/verto/tests/assets/image/align_center_expected.html
index ae3c221f..130274a4 100644
--- a/verto/tests/assets/image/align_center_expected.html
+++ b/verto/tests/assets/image/align_center_expected.html
@@ -1,3 +1,3 @@
 <div>
- <img class="center-align" src="{% static 'computer-studying-turing-test.png' %}"/>
+<img class="center-align" src="{% static 'computer-studying-turing-test.png' %}" />
 </div>
diff --git a/verto/tests/assets/image/align_left_expected.html b/verto/tests/assets/image/align_left_expected.html
index 3b983786..3b7d79f1 100644
--- a/verto/tests/assets/image/align_left_expected.html
+++ b/verto/tests/assets/image/align_left_expected.html
@@ -1,3 +1,3 @@
 <div>
- <img class="left-align" src="{% static 'computer-studying-turing-test.png' %}"/>
+<img class="left-align" src="{% static 'computer-studying-turing-test.png' %}" />
 </div>
diff --git a/verto/tests/assets/image/align_right_expected.html b/verto/tests/assets/image/align_right_expected.html
index 50b5ff0b..6f88c4ca 100644
--- a/verto/tests/assets/image/align_right_expected.html
+++ b/verto/tests/assets/image/align_right_expected.html
@@ -1,3 +1,3 @@
 <div>
- <img class="right-align" src="{% static 'computer-studying-turing-test.png' %}"/>
+<img class="right-align" src="{% static 'computer-studying-turing-test.png' %}" />
 </div>
diff --git a/verto/tests/assets/image/contains_alt_expected.html b/verto/tests/assets/image/contains_alt_expected.html
index f3ec259b..10225441 100644
--- a/verto/tests/assets/image/contains_alt_expected.html
+++ b/verto/tests/assets/image/contains_alt_expected.html
@@ -1,3 +1,3 @@
 <div>
- <img alt="Lipsum" class="" src="{% static 'computer-studying-turing-test.png' %}"/>
+<img alt="Lipsum" class="" src="{% static 'computer-studying-turing-test.png' %}" />
 </div>
diff --git a/verto/tests/assets/image/contains_caption_expected.html b/verto/tests/assets/image/contains_caption_expected.html
index 7de513ec..c889960f 100644
--- a/verto/tests/assets/image/contains_caption_expected.html
+++ b/verto/tests/assets/image/contains_caption_expected.html
@@ -1,6 +1,4 @@
 <div>
- <img class="" src="{% static 'computer-studying-turing-test.png' %}"/>
- <p>
-  Lipsum
- </p>
+<img class="" src="{% static 'computer-studying-turing-test.png' %}" />
+<p>Lipsum</p>
 </div>
diff --git a/verto/tests/assets/image/contains_caption_link_expected.html b/verto/tests/assets/image/contains_caption_link_expected.html
index e9bbab53..e2d38f64 100644
--- a/verto/tests/assets/image/contains_caption_link_expected.html
+++ b/verto/tests/assets/image/contains_caption_link_expected.html
@@ -1,8 +1,4 @@
 <div>
- <img class="" src="{% static 'computer-studying-turing-test.png' %}"/>
- <p>
-  <a href="example.com">
-   Lipsum
-  </a>
- </p>
+<img class="" src="{% static 'computer-studying-turing-test.png' %}" />
+<p><a href="example.com">Lipsum</a></p>
 </div>
diff --git a/verto/tests/assets/image/contains_hover_text_expected.html b/verto/tests/assets/image/contains_hover_text_expected.html
index f35d5f6f..c4f06812 100644
--- a/verto/tests/assets/image/contains_hover_text_expected.html
+++ b/verto/tests/assets/image/contains_hover_text_expected.html
@@ -1,3 +1,3 @@
 <div>
- <img class="" src="{% static 'computer-studying-turing-test.png' %}" title="Lipsum"/>
+<img class="" src="{% static 'computer-studying-turing-test.png' %}" title="Lipsum" />
 </div>
diff --git a/verto/tests/assets/image/contains_image_and_text_contains_word_image_expected.html b/verto/tests/assets/image/contains_image_and_text_contains_word_image_expected.html
index 27715900..f0d98770 100644
--- a/verto/tests/assets/image/contains_image_and_text_contains_word_image_expected.html
+++ b/verto/tests/assets/image/contains_image_and_text_contains_word_image_expected.html
@@ -1,9 +1,5 @@
-<p>
- Imagine we have the following simple black and white image.
-</p>
+<p>Imagine we have the following simple black and white image.</p>
 <div>
- <img alt="A diamond shape made out of pixels" class="" src="{% static 'pixel-diamond.png' %}"/>
+<img alt="A diamond shape made out of pixels" class="" src="{% static 'pixel-diamond.png' %}" />
 </div>
-<p>
- One very simple way a computer can store this image in binary is by using a format where '0' means white and '1' means black (this is a "bit map", because we've mapped the pixels onto the values of bits). Using this method, the above image would be represented in the following way:
-</p>
+<p>One very simple way a computer can store this image in binary is by using a format where '0' means white and '1' means black (this is a "bit map", because we've mapped the pixels onto the values of bits). Using this method, the above image would be represented in the following way:</p>
diff --git a/verto/tests/assets/image/contains_image_expected.html b/verto/tests/assets/image/contains_image_expected.html
index 66b16632..2b98590e 100644
--- a/verto/tests/assets/image/contains_image_expected.html
+++ b/verto/tests/assets/image/contains_image_expected.html
@@ -1,14 +1,4 @@
 <div>
- <img alt="The computer is reading a book titled 'Talk like a human'" class="" src="{% static 'computer-studying-turing-test.png' %}"/>
+<img alt="The computer is reading a book titled 'Talk like a human'" class="" src="{% static 'computer-studying-turing-test.png' %}" />
 </div>
-<p>
- Many humans take for granted the fact that they can easily have a conversation with another person, and choose appropriate things to say based on the conversation. The ability to do this is a form of intelligence, and for computers it isn’t so easy! Many attempts have been made to design computer programs that can have a conversation with a human and sound intelligent. These computer programs are called
- <em>
-  chatterbots
- </em>
- , or just
- <em>
-  chatbots
- </em>
- .
-</p>
+<p>Many humans take for granted the fact that they can easily have a conversation with another person, and choose appropriate things to say based on the conversation. The ability to do this is a form of intelligence, and for computers it isn’t so easy! Many attempts have been made to design computer programs that can have a conversation with a human and sound intelligent. These computer programs are called <em>chatterbots</em>, or just <em>chatbots</em>.</p>
diff --git a/verto/tests/assets/image/contains_multiple_images_expected.html b/verto/tests/assets/image/contains_multiple_images_expected.html
index 27544d93..e266029e 100644
--- a/verto/tests/assets/image/contains_multiple_images_expected.html
+++ b/verto/tests/assets/image/contains_multiple_images_expected.html
@@ -1,23 +1,15 @@
-<p>
- Here's another FSA to consider:
-</p>
+<p>Here's another FSA to consider:</p>
 <div>
- <img alt="FSA with missing transitions" class="" src="{% static 'finite-state-automata-no-trap-example.png' %}"/>
+<img alt="FSA with missing transitions" class="" src="{% static 'finite-state-automata-no-trap-example.png' %}" />
 </div>
-<p>
- It's fairly clear what it will accept: strings like "ab", "abab", "abababababab", and, of course {math}\epsilon{math end}.
+<p>It's fairly clear what it will accept: strings like "ab", "abab", "abababababab", and, of course {math}\epsilon{math end}.
 But there are some missing transitions: if you are in state 1 and get a "b" there's nowhere to go.
-If an input cannot be accepted, it will be rejected, as in this case. We could have put in a trap state to make this clear:
-</p>
+If an input cannot be accepted, it will be rejected, as in this case. We could have put in a trap state to make this clear:</p>
 <div>
- <img alt="FSA with missing transitions" class="" src="{% static 'finite-state-automata-trap-added-example.png' %}"/>
+<img alt="FSA with missing transitions" class="" src="{% static 'finite-state-automata-trap-added-example.png' %}" />
 </div>
-<p>
- But things can get out of hand. What if there are more letters in the alphabet? We'd need something like this:
-</p>
+<p>But things can get out of hand. What if there are more letters in the alphabet? We'd need something like this:</p>
 <div>
- <img alt="FSA with missing transitions" class="" src="{% static 'finite-state-automata-trap-added-extreme-example.png' %}"/>
+<img alt="FSA with missing transitions" class="" src="{% static 'finite-state-automata-trap-added-extreme-example.png' %}" />
 </div>
-<p>
- So, instead, we just say that any unspecified transition causes the input to be rejected (that is, it behaves as though it goes into a trap state). In other words, it's fine to use the simple version above, with just two transitions.
-</p>
+<p>So, instead, we just say that any unspecified transition causes the input to be rejected (that is, it behaves as though it goes into a trap state). In other words, it's fine to use the simple version above, with just two transitions.</p>
diff --git a/verto/tests/assets/image/contains_source_expected.html b/verto/tests/assets/image/contains_source_expected.html
index 3bc55099..1094670e 100644
--- a/verto/tests/assets/image/contains_source_expected.html
+++ b/verto/tests/assets/image/contains_source_expected.html
@@ -1,8 +1,4 @@
 <div>
- <img class="" src="{% static 'computer-studying-turing-test.png' %}"/>
- <p>
-  <a href="example.com">
-   Source
-  </a>
- </p>
+<img class="" src="{% static 'computer-studying-turing-test.png' %}" />
+<p><a href="example.com">Source</a></p>
 </div>
diff --git a/verto/tests/assets/image/default_image_expected.html b/verto/tests/assets/image/default_image_expected.html
index 93371ae0..39d3fe96 100644
--- a/verto/tests/assets/image/default_image_expected.html
+++ b/verto/tests/assets/image/default_image_expected.html
@@ -1,24 +1,6 @@
 <div>
- <img alt="The computer is reading a book titled 'Talk like a human'" class="left-align" src="{% static 'computer-studying-turing-test.png' %}"/>
- <p>
-  <a href="iamaurl.com">
-   caption text
-  </a>
- </p>
- <p>
-  <a href="whatisthis.com">
-   Source
-  </a>
- </p>
+<img alt="The computer is reading a book titled 'Talk like a human'" class="left-align" src="{% static 'computer-studying-turing-test.png' %}" />
+<p><a href="iamaurl.com">caption text</a></p>
+<p><a href="whatisthis.com">Source</a></p>
 </div>
-<p>
- Many humans take for granted the fact that they can easily have a conversation with another person, and choose appropriate things to say based on the conversation. The ability to do this is a form of intelligence, and for computers it isn&rsquo;t so easy! Many attempts have been made to design computer programs that can have a conversation with a human and sound intelligent. These computer programs are called
- <em>
-  chatterbots
- </em>
- , or just
- <em>
-  chatbots
- </em>
- .
-</p>
+<p>Many humans take for granted the fact that they can easily have a conversation with another person, and choose appropriate things to say based on the conversation. The ability to do this is a form of intelligence, and for computers it isn’t so easy! Many attempts have been made to design computer programs that can have a conversation with a human and sound intelligent. These computer programs are called <em>chatterbots</em>, or just <em>chatbots</em>.</p>
diff --git a/verto/tests/assets/image/doc_example_2_override_html_expected.html b/verto/tests/assets/image/doc_example_2_override_html_expected.html
index 5a47ca8f..91b50311 100644
--- a/verto/tests/assets/image/doc_example_2_override_html_expected.html
+++ b/verto/tests/assets/image/doc_example_2_override_html_expected.html
@@ -1 +1 @@
-<img src="https://www.example.com/images/apple.png"/>
+<img src="https://www.example.com/images/apple.png" />
diff --git a/verto/tests/assets/image/doc_example_2_override_html_template.html b/verto/tests/assets/image/doc_example_2_override_html_template.html
index eafc74ee..1be3e5a3 100644
--- a/verto/tests/assets/image/doc_example_2_override_html_template.html
+++ b/verto/tests/assets/image/doc_example_2_override_html_template.html
@@ -1 +1 @@
-<img src="{{ file_path }}"/>
+<img src="{{ file_path }}">
diff --git a/verto/tests/assets/image/doc_example_basic_usage_expected.html b/verto/tests/assets/image/doc_example_basic_usage_expected.html
index cc4c1159..90829b68 100644
--- a/verto/tests/assets/image/doc_example_basic_usage_expected.html
+++ b/verto/tests/assets/image/doc_example_basic_usage_expected.html
@@ -1,11 +1,5 @@
 <div>
- <img class="left-align" src="http://placehold.it/350x150" title="This is hover text"/>
- <p>
-  Placeholder image
- </p>
- <p>
-  <a href="https://placehold.it/">
-   Source
-  </a>
- </p>
+<img class="left-align" src="http://placehold.it/350x150" title="This is hover text" />
+<p>Placeholder image</p>
+<p><a href="https://placehold.it/">Source</a></p>
 </div>
diff --git a/verto/tests/assets/image/doc_example_override_html_expected.html b/verto/tests/assets/image/doc_example_override_html_expected.html
index fe05d719..11846fa6 100644
--- a/verto/tests/assets/image/doc_example_override_html_expected.html
+++ b/verto/tests/assets/image/doc_example_override_html_expected.html
@@ -1,3 +1,3 @@
 <div class="text-center">
- <img class="rounded img-thumbnail" src="http://placehold.it/350x150"/>
+<img class="rounded img-thumbnail" src="http://placehold.it/350x150" />
 </div>
diff --git a/verto/tests/assets/image/doc_example_override_html_template.html b/verto/tests/assets/image/doc_example_override_html_template.html
index a3a8f922..1ea96063 100644
--- a/verto/tests/assets/image/doc_example_override_html_template.html
+++ b/verto/tests/assets/image/doc_example_override_html_template.html
@@ -1,3 +1,3 @@
 <div class="text-center">
-  <img src="{{ file_path }}" class="rounded img-thumbnail"/>
+<img src="{{ file_path }}" class="rounded img-thumbnail" />
 </div>
diff --git a/verto/tests/assets/image/external_image_expected.html b/verto/tests/assets/image/external_image_expected.html
index 3426f777..9351ed34 100644
--- a/verto/tests/assets/image/external_image_expected.html
+++ b/verto/tests/assets/image/external_image_expected.html
@@ -1,6 +1,4 @@
 <div>
- <img alt="UDP Encapsulation" class="" src="https://upload.wikimedia.org/wikipedia/commons/thumb/3/3b/UDP_encapsulation.svg/800px-UDP_encapsulation.svg.png"/>
+<img alt="UDP Encapsulation" class="" src="https://upload.wikimedia.org/wikipedia/commons/thumb/3/3b/UDP_encapsulation.svg/800px-UDP_encapsulation.svg.png" />
 </div>
-<p>
- TODO: Upload this image to field guide, and link back to svg page.
-</p>
+<p>TODO: Upload this image to field guide, and link back to svg page.</p>
diff --git a/verto/tests/assets/image/image_in_numbered_list_expected.html b/verto/tests/assets/image/image_in_numbered_list_expected.html
index 297994a4..9fbd62f1 100644
--- a/verto/tests/assets/image/image_in_numbered_list_expected.html
+++ b/verto/tests/assets/image/image_in_numbered_list_expected.html
@@ -1,39 +1,21 @@
 <ol>
- <li>
-  <p>
-   Lipsum
-  </p>
-  <ul>
-   <li>
-    Ichi
-   </li>
-   <li>
-    Ni
-   </li>
-   <li>
-    San
-   </li>
-  </ul>
- </li>
- <li>
-  <p>
-   Lorem
-  </p>
-  <div>
-   <img class="left-align" src="http://placehold.it/350x150" title="This is hover text"/>
-   <p>
-    Placeholder image
-   </p>
-   <p>
-    <a href="https://placehold.it/">
-     Source
-    </a>
-   </p>
-  </div>
- </li>
- <li>
-  <p>
-   Ipsem
-  </p>
- </li>
+<li>
+<p>Lipsum</p>
+<ul>
+<li>Ichi</li>
+<li>Ni</li>
+<li>San</li>
+</ul>
+</li>
+<li>
+<p>Lorem</p>
+<div>
+<img class="left-align" src="http://placehold.it/350x150" title="This is hover text" />
+<p>Placeholder image</p>
+<p><a href="https://placehold.it/">Source</a></p>
+</div>
+</li>
+<li>
+<p>Ipsem</p>
+</li>
 </ol>
diff --git a/verto/tests/assets/image/internal_image_expected.html b/verto/tests/assets/image/internal_image_expected.html
index 27715900..f0d98770 100644
--- a/verto/tests/assets/image/internal_image_expected.html
+++ b/verto/tests/assets/image/internal_image_expected.html
@@ -1,9 +1,5 @@
-<p>
- Imagine we have the following simple black and white image.
-</p>
+<p>Imagine we have the following simple black and white image.</p>
 <div>
- <img alt="A diamond shape made out of pixels" class="" src="{% static 'pixel-diamond.png' %}"/>
+<img alt="A diamond shape made out of pixels" class="" src="{% static 'pixel-diamond.png' %}" />
 </div>
-<p>
- One very simple way a computer can store this image in binary is by using a format where '0' means white and '1' means black (this is a "bit map", because we've mapped the pixels onto the values of bits). Using this method, the above image would be represented in the following way:
-</p>
+<p>One very simple way a computer can store this image in binary is by using a format where '0' means white and '1' means black (this is a "bit map", because we've mapped the pixels onto the values of bits). Using this method, the above image would be represented in the following way:</p>
diff --git a/verto/tests/assets/image/text_contains_the_word_image_expected.html b/verto/tests/assets/image/text_contains_the_word_image_expected.html
index 94b4b521..e9e3a96b 100644
--- a/verto/tests/assets/image/text_contains_the_word_image_expected.html
+++ b/verto/tests/assets/image/text_contains_the_word_image_expected.html
@@ -1,8 +1,6 @@
-<p>
- There is an image format that uses the simple one-symbol-per-pixel representation we have just described. The format is called "portable bitmap format" (PBM).
-PBM files are saved with the file extension &ldquo;.pbm&rdquo;, and contain a simple header, followed by the image data.
+<p>There is an image format that uses the simple one-symbol-per-pixel representation we have just described. The format is called "portable bitmap format" (PBM).
+PBM files are saved with the file extension “.pbm”, and contain a simple header, followed by the image data.
 The data in the file can be viewed by opening it in a text editor, much like opening a .txt file,
 and the image itself can be viewed by opening it in a drawing or image viewing program that supports PBM files
 (the format isn't very well supported, but a number of image viewing and editing programs can display them).
-A pbm file for the diamond image used earlier would be as follows:
-</p>
+A pbm file for the diamond image used earlier would be as follows:</p>
diff --git a/verto/tests/assets/interactive/doc_example_iframe_usage_expected.html b/verto/tests/assets/interactive/doc_example_iframe_usage_expected.html
index 59b09113..8e04ad3a 100644
--- a/verto/tests/assets/interactive/doc_example_iframe_usage_expected.html
+++ b/verto/tests/assets/interactive/doc_example_iframe_usage_expected.html
@@ -1,5 +1,3 @@
 <iframe src="{% url 'interactive' name='binary-cards' %}?digits=5&amp;start=BBBBB">
- <p>
-  Your browser does not support iframes.
- </p>
+<p>Your browser does not support iframes.</p>
 </iframe>
diff --git a/verto/tests/assets/interactive/doc_example_override_html_expected.html b/verto/tests/assets/interactive/doc_example_override_html_expected.html
index 0dc7722e..579c2fb4 100644
--- a/verto/tests/assets/interactive/doc_example_override_html_expected.html
+++ b/verto/tests/assets/interactive/doc_example_override_html_expected.html
@@ -1,5 +1,5 @@
 <a class="btn btn-interactive-link" href="{% url 'interactive' name='binary-cards' %}?digits=5&amp;start=BBBBB">
- <div class="btn-interactive-whole-page-text">
-  Binary Cards Interactive
- </div>
+<div class="btn-interactive-whole-page-text">
+Binary Cards Interactive
+</div>
 </a>
diff --git a/verto/tests/assets/interactive/doc_example_override_html_template.html b/verto/tests/assets/interactive/doc_example_override_html_template.html
index 11aabd45..868a4a3f 100644
--- a/verto/tests/assets/interactive/doc_example_override_html_template.html
+++ b/verto/tests/assets/interactive/doc_example_override_html_template.html
@@ -1,21 +1,21 @@
 {% if type == 'in-page' -%}
-  <div>
-    {{ "{{% include 'interactive/" }}{{ name }}{{ "/index.html' %}}" }}
-  </div>
+<div>
+{{ "{{% include 'interactive/" }}{{ name }}{{ "/index.html' %}}" }}
+</div>
 {% elif type == 'iframe' -%}
-  <iframe src="{{ "{% url 'interactive' name='" }}{{ name }}{{ "' %}" }}{% if parameters %}?{{ parameters }}{% endif %}">
-    <p>Your browser does not support iframes.</p>
-  </iframe>
+<iframe src="{{ "{% url 'interactive' name='" }}{{ name }}{{ "' %}" }}{% if parameters %}?{{ parameters }}{% endif %}">
+<p>Your browser does not support iframes.</p>
+</iframe>
 {% elif type == 'whole-page' -%}
-  <a
-    href="{{ "{% url 'interactive' name='" }}{{ name }}{{ "' %}" }}{% if parameters %}?{{ parameters }}{% endif %}"
-    class="btn btn-interactive-link">
-    <div class="btn-interactive-whole-page-text">
-      {% if text -%}
-        {{ text }}
-      {% else -%}
-        Click to load {{ name }}
-      {% endif -%}
-    </div>
-  </a>
+<a
+   href="{{ "{% url 'interactive' name='" }}{{ name }}{{ "' %}" }}{% if parameters %}?{{ parameters }}{% endif %}"
+   class="btn btn-interactive-link">
+<div class="btn-interactive-whole-page-text">
+{% if text -%}
+{{ text }}
+{% else -%}
+Click to load {{ name }}
+{% endif -%}
+</div>
+</a>
 {%- endif -%}
diff --git a/verto/tests/assets/interactive/doc_example_whole_page_usage_expected.html b/verto/tests/assets/interactive/doc_example_whole_page_usage_expected.html
index 062f1654..71ab16c7 100644
--- a/verto/tests/assets/interactive/doc_example_whole_page_usage_expected.html
+++ b/verto/tests/assets/interactive/doc_example_whole_page_usage_expected.html
@@ -1,6 +1,6 @@
 <a class="btn btn-interactive-link" href="{% url 'interactive' name='binary-cards' %}?digits=5&amp;start=BBBBB">
- <img class="btn-interactive-link-image" src="{% static 'binary-cards/thumbnail.png' %}"/>
- <div class="btn-interactive-whole-page-text">
-  Binary Cards Interactive
- </div>
+<img class="btn-interactive-link-image" src="{% static 'binary-cards/thumbnail.png' %}" />
+<div class="btn-interactive-whole-page-text">
+Binary Cards Interactive
+</div>
 </a>
diff --git a/verto/tests/assets/jinja/doc_example_basic_usage.md b/verto/tests/assets/jinja/doc_example_basic_usage.md
index 1d9f8022..0476f996 100644
--- a/verto/tests/assets/jinja/doc_example_basic_usage.md
+++ b/verto/tests/assets/jinja/doc_example_basic_usage.md
@@ -1,7 +1,7 @@
 <div>
- {% if thing &lt; object %}
-   <p>
-    A paragraph explaining the &lt; operation.
-   </p>
- {% endif %}
+{% if thing &lt; object %}
+<p>
+A paragraph explaining the &lt; operation.
+</p>
+{% endif %}
 </div>
diff --git a/verto/tests/assets/jinja/doc_example_basic_usage_expected.html b/verto/tests/assets/jinja/doc_example_basic_usage_expected.html
index 2af4bcef..04d63563 100644
--- a/verto/tests/assets/jinja/doc_example_basic_usage_expected.html
+++ b/verto/tests/assets/jinja/doc_example_basic_usage_expected.html
@@ -1,7 +1,7 @@
 <div>
- {% if thing < object %}
- <p>
-  A paragraph explaining the &lt; operation.
- </p>
- {% endif %}
+{% if thing < object %}
+<p>
+A paragraph explaining the &lt; operation.
+</p>
+{% endif %}
 </div>
diff --git a/verto/tests/assets/markdown-override/ordered_list_loose_expected.html b/verto/tests/assets/markdown-override/ordered_list_loose_expected.html
index baf5cae3..1c897092 100644
--- a/verto/tests/assets/markdown-override/ordered_list_loose_expected.html
+++ b/verto/tests/assets/markdown-override/ordered_list_loose_expected.html
@@ -1,20 +1,12 @@
-<p>
- Numbered loose:
-</p>
+<p>Numbered loose:</p>
 <ol>
- <li>
-  <p>
-   Lipsum
-  </p>
- </li>
- <li>
-  <p>
-   Lorem
-  </p>
- </li>
- <li>
-  <p>
-   Ipsem
-  </p>
- </li>
+<li>
+<p>Lipsum</p>
+</li>
+<li>
+<p>Lorem</p>
+</li>
+<li>
+<p>Ipsem</p>
+</li>
 </ol>
diff --git a/verto/tests/assets/markdown-override/ordered_list_multiple_paragraphs_expected.html b/verto/tests/assets/markdown-override/ordered_list_multiple_paragraphs_expected.html
index ad52b94f..0a311c54 100644
--- a/verto/tests/assets/markdown-override/ordered_list_multiple_paragraphs_expected.html
+++ b/verto/tests/assets/markdown-override/ordered_list_multiple_paragraphs_expected.html
@@ -1,30 +1,16 @@
 <ol>
- <li>
-  <p>
-   Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed luctus augue non nisi commodo volutpat.
-Aliquam erat volutpat. Class aptent.
-  </p>
- </li>
- <li>
-  <p>
-   Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-  </p>
-  <p>
-   Aenean et ligula gravida, tempor massa et, pulvinar tortor.
-  </p>
- </li>
- <li>
-  <p>
-   Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus vestibulum sollicitudin purus nec auctor.
-  </p>
-  <p>
-   Sed sed tortor tempus, ullamcorper lorem in, elementum nisl. Phasellus non nibh ligula.
-  </p>
-  <p>
-   Phasellus vestibulum turpis vel tortor semper egestas. Cras eu maximus lorem.
-  </p>
-  <p>
-   Curabitur ultrices egestas libero, ut dictum enim porta in. Pellentesque habitant morbi.
-  </p>
- </li>
+<li>
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed luctus augue non nisi commodo volutpat.
+Aliquam erat volutpat. Class aptent.</p>
+</li>
+<li>
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
+<p>Aenean et ligula gravida, tempor massa et, pulvinar tortor.</p>
+</li>
+<li>
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus vestibulum sollicitudin purus nec auctor.</p>
+<p>Sed sed tortor tempus, ullamcorper lorem in, elementum nisl. Phasellus non nibh ligula.</p>
+<p>Phasellus vestibulum turpis vel tortor semper egestas. Cras eu maximus lorem.</p>
+<p>Curabitur ultrices egestas libero, ut dictum enim porta in. Pellentesque habitant morbi.</p>
+</li>
 </ol>
diff --git a/verto/tests/assets/markdown-override/ordered_list_tight_expected.html b/verto/tests/assets/markdown-override/ordered_list_tight_expected.html
index 3d525990..27dad563 100644
--- a/verto/tests/assets/markdown-override/ordered_list_tight_expected.html
+++ b/verto/tests/assets/markdown-override/ordered_list_tight_expected.html
@@ -1,14 +1,6 @@
-<p>
- Numbered tight:
-</p>
+<p>Numbered tight:</p>
 <ol>
- <li>
-  Lipsum
- </li>
- <li>
-  Lorem
- </li>
- <li>
-  Ipsem
- </li>
+<li>Lipsum</li>
+<li>Lorem</li>
+<li>Ipsem</li>
 </ol>
diff --git a/verto/tests/assets/markdown-override/ordered_list_tight_nested_expected.html b/verto/tests/assets/markdown-override/ordered_list_tight_nested_expected.html
index 572ed2cf..5923123f 100644
--- a/verto/tests/assets/markdown-override/ordered_list_tight_nested_expected.html
+++ b/verto/tests/assets/markdown-override/ordered_list_tight_nested_expected.html
@@ -1,20 +1,12 @@
 <ol>
- <li>
-  List 1
-  <ol>
-   <li>
-    List 2
-    <ol>
-     <li>
-      List 3
-      <ol>
-       <li>
-        List 4
-       </li>
-      </ol>
-     </li>
-    </ol>
-   </li>
-  </ol>
- </li>
+<li>List 1<ol>
+<li>List 2<ol>
+<li>List 3<ol>
+<li>List 4</li>
+</ol>
+</li>
+</ol>
+</li>
+</ol>
+</li>
 </ol>
diff --git a/verto/tests/assets/markdown-override/sane_list_expected.html b/verto/tests/assets/markdown-override/sane_list_expected.html
index ef20be43..03c91163 100644
--- a/verto/tests/assets/markdown-override/sane_list_expected.html
+++ b/verto/tests/assets/markdown-override/sane_list_expected.html
@@ -1,16 +1,8 @@
 <ol>
- <li>
-  Ordered item 1
- </li>
- <li>
-  Ordered item 2
- </li>
+<li>Ordered item 1</li>
+<li>Ordered item 2</li>
 </ol>
 <ul>
- <li>
-  Unordered item 1
- </li>
- <li>
-  Unordered item 2
- </li>
+<li>Unordered item 1</li>
+<li>Unordered item 2</li>
 </ul>
diff --git a/verto/tests/assets/markdown-override/sane_list_python_markdown_expected.html b/verto/tests/assets/markdown-override/sane_list_python_markdown_expected.html
index 0469b011..1dd22113 100644
--- a/verto/tests/assets/markdown-override/sane_list_python_markdown_expected.html
+++ b/verto/tests/assets/markdown-override/sane_list_python_markdown_expected.html
@@ -1,10 +1,6 @@
-<p>
- A Paragraph.
-* Not a list item.
-</p>
+<p>A Paragraph.
+* Not a list item.</p>
 <ol>
- <li>
-  Ordered list item.
-* Not a separate list item.
- </li>
+<li>Ordered list item.
+* Not a separate list item.</li>
 </ol>
diff --git a/verto/tests/assets/markdown-override/unordered_list_asterisk_loose_expected.html b/verto/tests/assets/markdown-override/unordered_list_asterisk_loose_expected.html
index bf744c10..38e43531 100644
--- a/verto/tests/assets/markdown-override/unordered_list_asterisk_loose_expected.html
+++ b/verto/tests/assets/markdown-override/unordered_list_asterisk_loose_expected.html
@@ -1,20 +1,12 @@
-<p>
- Asterisks loose:
-</p>
+<p>Asterisks loose:</p>
 <ul>
- <li>
-  <p>
-   Lipsum
-  </p>
- </li>
- <li>
-  <p>
-   Lorem
-  </p>
- </li>
- <li>
-  <p>
-   Ipsem
-  </p>
- </li>
+<li>
+<p>Lipsum</p>
+</li>
+<li>
+<p>Lorem</p>
+</li>
+<li>
+<p>Ipsem</p>
+</li>
 </ul>
diff --git a/verto/tests/assets/markdown-override/unordered_list_asterisk_tight_expected.html b/verto/tests/assets/markdown-override/unordered_list_asterisk_tight_expected.html
index b209c24f..93ed3bec 100644
--- a/verto/tests/assets/markdown-override/unordered_list_asterisk_tight_expected.html
+++ b/verto/tests/assets/markdown-override/unordered_list_asterisk_tight_expected.html
@@ -1,14 +1,6 @@
-<p>
- Asterisks tight:
-</p>
+<p>Asterisks tight:</p>
 <ul>
- <li>
-  Lipsum
- </li>
- <li>
-  Lorem
- </li>
- <li>
-  Ipsem
- </li>
+<li>Lipsum</li>
+<li>Lorem</li>
+<li>Ipsem</li>
 </ul>
diff --git a/verto/tests/assets/markdown-override/unordered_list_loose_nested_expected.html b/verto/tests/assets/markdown-override/unordered_list_loose_nested_expected.html
index 4687f4ca..5c415cc0 100644
--- a/verto/tests/assets/markdown-override/unordered_list_loose_nested_expected.html
+++ b/verto/tests/assets/markdown-override/unordered_list_loose_nested_expected.html
@@ -1,34 +1,22 @@
 <ul>
- <li>
-  <p>
-   Lipsum
-  </p>
- </li>
- <li>
-  <p>
-   Lorem:
-  </p>
-  <ul>
-   <li>
-    <p>
-     Inner Item 1
-    </p>
-   </li>
-   <li>
-    <p>
-     Inner Item 2
-    </p>
-   </li>
-   <li>
-    <p>
-     Inner Item 3
-    </p>
-   </li>
-  </ul>
- </li>
- <li>
-  <p>
-   Ipsem
-  </p>
- </li>
+<li>
+<p>Lipsum</p>
+</li>
+<li>
+<p>Lorem:</p>
+<ul>
+<li>
+<p>Inner Item 1</p>
+</li>
+<li>
+<p>Inner Item 2</p>
+</li>
+<li>
+<p>Inner Item 3</p>
+</li>
+</ul>
+</li>
+<li>
+<p>Ipsem</p>
+</li>
 </ul>
diff --git a/verto/tests/assets/markdown-override/unordered_list_mixed_nested_expected.html b/verto/tests/assets/markdown-override/unordered_list_mixed_nested_expected.html
index 4f3a0339..a5e4d14f 100644
--- a/verto/tests/assets/markdown-override/unordered_list_mixed_nested_expected.html
+++ b/verto/tests/assets/markdown-override/unordered_list_mixed_nested_expected.html
@@ -1,28 +1,16 @@
 <ul>
- <li>
-  <p>
-   Lipsum
-  </p>
- </li>
- <li>
-  <p>
-   Lorem:
-  </p>
-  <ul>
-   <li>
-    Inner Item 1
-   </li>
-   <li>
-    Inner Item 2
-   </li>
-   <li>
-    Inner Item 3
-   </li>
-  </ul>
- </li>
- <li>
-  <p>
-   Ipsem
-  </p>
- </li>
+<li>
+<p>Lipsum</p>
+</li>
+<li>
+<p>Lorem:</p>
+<ul>
+<li>Inner Item 1</li>
+<li>Inner Item 2</li>
+<li>Inner Item 3</li>
+</ul>
+</li>
+<li>
+<p>Ipsem</p>
+</li>
 </ul>
diff --git a/verto/tests/assets/markdown-override/unordered_list_tight_nested_expected.html b/verto/tests/assets/markdown-override/unordered_list_tight_nested_expected.html
index 23775cb9..e3b5696c 100644
--- a/verto/tests/assets/markdown-override/unordered_list_tight_nested_expected.html
+++ b/verto/tests/assets/markdown-override/unordered_list_tight_nested_expected.html
@@ -1,22 +1,10 @@
 <ul>
- <li>
-  Lipsum
- </li>
- <li>
-  Lorem:
-  <ul>
-   <li>
-    Inner Item 1
-   </li>
-   <li>
-    Inner Item 2
-   </li>
-   <li>
-    Inner Item 3
-   </li>
-  </ul>
- </li>
- <li>
-  Ipsem
- </li>
+<li>Lipsum</li>
+<li>Lorem:<ul>
+<li>Inner Item 1</li>
+<li>Inner Item 2</li>
+<li>Inner Item 3</li>
+</ul>
+</li>
+<li>Ipsem</li>
 </ul>
diff --git a/verto/tests/assets/panel/contains_inner_image_expected.html b/verto/tests/assets/panel/contains_inner_image_expected.html
index 25d4f9d3..5b149fb3 100644
--- a/verto/tests/assets/panel/contains_inner_image_expected.html
+++ b/verto/tests/assets/panel/contains_inner_image_expected.html
@@ -1,27 +1,14 @@
 <div class="panel panel-extra-for-experts panel-expanded-always">
- <div class="panel-header">
-  <strong>
-   Lorem ipsum:
-  </strong>
-  Nunc non accumsan
- </div>
- <div class="panel-body">
-  <p>
-   Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc non accumsan libero, et suscipit velit. Phasellus quis lorem eget lacus rutrum lobortis. Integer tincidunt convallis arcu a porttitor. Ut urna sapien, egestas mollis lectus a, suscipit placerat ante. Vestibulum id congue tellus. Nullam dapibus felis eu ligula mattis, vel consectetur nibh aliquet. Maecenas nec elit orci. Curabitur ut massa maximus, ultrices diam at, porttitor erat. Praesent eu purus vitae ligula elementum iaculis in non eros. Quisque eu aliquet dolor, ut pharetra lacus.
-  </p>
-  <div>
-   <img class="left-align" src="http://placehold.it/350x150" title="This is hover text"/>
-   <p>
-    Placeholder image
-   </p>
-   <p>
-    <a href="https://placehold.it/">
-     Source
-    </a>
-   </p>
-  </div>
-  <p>
-   Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc non accumsan libero, et suscipit velit. Phasellus quis lorem eget lacus rutrum lobortis. Integer tincidunt convallis arcu a porttitor. Ut urna sapien, egestas mollis lectus a, suscipit placerat ante. Vestibulum id congue tellus. Nullam dapibus felis eu ligula mattis, vel consectetur nibh aliquet. Maecenas nec elit orci. Curabitur ut massa maximus, ultrices diam at, porttitor erat. Praesent eu purus vitae ligula elementum iaculis in non eros. Quisque eu aliquet dolor, ut pharetra lacus.
-  </p>
- </div>
+<div class="panel-header">
+<strong>Lorem ipsum:</strong> Nunc non accumsan
+</div>
+<div class="panel-body">
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc non accumsan libero, et suscipit velit. Phasellus quis lorem eget lacus rutrum lobortis. Integer tincidunt convallis arcu a porttitor. Ut urna sapien, egestas mollis lectus a, suscipit placerat ante. Vestibulum id congue tellus. Nullam dapibus felis eu ligula mattis, vel consectetur nibh aliquet. Maecenas nec elit orci. Curabitur ut massa maximus, ultrices diam at, porttitor erat. Praesent eu purus vitae ligula elementum iaculis in non eros. Quisque eu aliquet dolor, ut pharetra lacus.</p>
+<div>
+<img class="left-align" src="http://placehold.it/350x150" title="This is hover text" />
+<p>Placeholder image</p>
+<p><a href="https://placehold.it/">Source</a></p>
+</div>
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc non accumsan libero, et suscipit velit. Phasellus quis lorem eget lacus rutrum lobortis. Integer tincidunt convallis arcu a porttitor. Ut urna sapien, egestas mollis lectus a, suscipit placerat ante. Vestibulum id congue tellus. Nullam dapibus felis eu ligula mattis, vel consectetur nibh aliquet. Maecenas nec elit orci. Curabitur ut massa maximus, ultrices diam at, porttitor erat. Praesent eu purus vitae ligula elementum iaculis in non eros. Quisque eu aliquet dolor, ut pharetra lacus.</p>
+</div>
 </div>
diff --git a/verto/tests/assets/panel/contains_inner_panel_expected.html b/verto/tests/assets/panel/contains_inner_panel_expected.html
index eda55a68..f6287b8e 100644
--- a/verto/tests/assets/panel/contains_inner_panel_expected.html
+++ b/verto/tests/assets/panel/contains_inner_panel_expected.html
@@ -1,29 +1,17 @@
 <div class="panel panel-extra-for-experts panel-expanded-always">
- <div class="panel-header">
-  <strong>
-   Lorem ipsum:
-  </strong>
-  Nunc non accumsan
- </div>
- <div class="panel-body">
-  <p>
-   Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc non accumsan libero, et suscipit velit. Phasellus quis lorem eget lacus rutrum lobortis. Integer tincidunt convallis arcu a porttitor. Ut urna sapien, egestas mollis lectus a, suscipit placerat ante. Vestibulum id congue tellus. Nullam dapibus felis eu ligula mattis, vel consectetur nibh aliquet. Maecenas nec elit orci. Curabitur ut massa maximus, ultrices diam at, porttitor erat. Praesent eu purus vitae ligula elementum iaculis in non eros. Quisque eu aliquet dolor, ut pharetra lacus.
-  </p>
-  <div class="panel panel-extra-for-experts">
-   <div class="panel-header">
-    <strong>
-     Lorem ipsum:
-    </strong>
-    Nunc non accumsan
-   </div>
-   <div class="panel-body">
-    <p>
-     Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc non accumsan libero, et suscipit velit. Phasellus quis lorem eget lacus rutrum lobortis. Integer tincidunt convallis arcu a porttitor. Ut urna sapien, egestas mollis lectus a, suscipit placerat ante. Vestibulum id congue tellus. Nullam dapibus felis eu ligula mattis, vel consectetur nibh aliquet. Maecenas nec elit orci. Curabitur ut massa maximus, ultrices diam at, porttitor erat. Praesent eu purus vitae ligula elementum iaculis in non eros. Quisque eu aliquet dolor, ut pharetra lacus.
-    </p>
-   </div>
-  </div>
-  <p>
-   Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc non accumsan libero, et suscipit velit. Phasellus quis lorem eget lacus rutrum lobortis. Integer tincidunt convallis arcu a porttitor. Ut urna sapien, egestas mollis lectus a, suscipit placerat ante. Vestibulum id congue tellus. Nullam dapibus felis eu ligula mattis, vel consectetur nibh aliquet. Maecenas nec elit orci. Curabitur ut massa maximus, ultrices diam at, porttitor erat. Praesent eu purus vitae ligula elementum iaculis in non eros. Quisque eu aliquet dolor, ut pharetra lacus.
-  </p>
- </div>
+<div class="panel-header">
+<strong>Lorem ipsum:</strong> Nunc non accumsan
+</div>
+<div class="panel-body">
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc non accumsan libero, et suscipit velit. Phasellus quis lorem eget lacus rutrum lobortis. Integer tincidunt convallis arcu a porttitor. Ut urna sapien, egestas mollis lectus a, suscipit placerat ante. Vestibulum id congue tellus. Nullam dapibus felis eu ligula mattis, vel consectetur nibh aliquet. Maecenas nec elit orci. Curabitur ut massa maximus, ultrices diam at, porttitor erat. Praesent eu purus vitae ligula elementum iaculis in non eros. Quisque eu aliquet dolor, ut pharetra lacus.</p>
+<div class="panel panel-extra-for-experts">
+<div class="panel-header">
+<strong>Lorem ipsum:</strong> Nunc non accumsan
+</div>
+<div class="panel-body">
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc non accumsan libero, et suscipit velit. Phasellus quis lorem eget lacus rutrum lobortis. Integer tincidunt convallis arcu a porttitor. Ut urna sapien, egestas mollis lectus a, suscipit placerat ante. Vestibulum id congue tellus. Nullam dapibus felis eu ligula mattis, vel consectetur nibh aliquet. Maecenas nec elit orci. Curabitur ut massa maximus, ultrices diam at, porttitor erat. Praesent eu purus vitae ligula elementum iaculis in non eros. Quisque eu aliquet dolor, ut pharetra lacus.</p>
+</div>
+</div>
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc non accumsan libero, et suscipit velit. Phasellus quis lorem eget lacus rutrum lobortis. Integer tincidunt convallis arcu a porttitor. Ut urna sapien, egestas mollis lectus a, suscipit placerat ante. Vestibulum id congue tellus. Nullam dapibus felis eu ligula mattis, vel consectetur nibh aliquet. Maecenas nec elit orci. Curabitur ut massa maximus, ultrices diam at, porttitor erat. Praesent eu purus vitae ligula elementum iaculis in non eros. Quisque eu aliquet dolor, ut pharetra lacus.</p>
+</div>
 </div>
diff --git a/verto/tests/assets/panel/contains_multiple_panels_expected.html b/verto/tests/assets/panel/contains_multiple_panels_expected.html
index 2c69507e..e114ff6a 100644
--- a/verto/tests/assets/panel/contains_multiple_panels_expected.html
+++ b/verto/tests/assets/panel/contains_multiple_panels_expected.html
@@ -1,53 +1,25 @@
 <div class="panel panel-extra-for-experts">
- <div class="panel-header">
-  <strong>
-   Algorithm complexity
-  </strong>
- </div>
- <div class="panel-body">
-  <p>
-   The formal term for working out the cost of an algorithm is
-   <a href="https://en.wikipedia.org/wiki/Analysis_of_algorithms">
-    algorithm analysis
-   </a>
-   , and we often refer to the cost as the algorithm's
-   <em>
-    complexity
-   </em>
-   . The most common complexity is the "time complexity" (a rough idea of how long it takes to run), but often the "space complexity" is of interest - how much memory or disk space will the algorithm use up when it's running?
-  </p>
-  <p>
-   There's more about how the cost of an algorithm is described in industry, using a widely agreed on convention called 'Big-O Notation', in the
-   <a href="chapters/algorithms.html#the-whole-story">
-    "The whole story!"
-   </a>
-   section at the end of this chapter.
-  </p>
- </div>
+<div class="panel-header">
+<strong>Algorithm complexity</strong>
+</div>
+<div class="panel-body">
+<p>The formal term for working out the cost of an algorithm is <a href="https://en.wikipedia.org/wiki/Analysis_of_algorithms">algorithm analysis</a>, and we often refer to the cost as the algorithm's <em>complexity</em>. The most common complexity is the "time complexity" (a rough idea of how long it takes to run), but often the "space complexity" is of interest - how much memory or disk space will the algorithm use up when it's running?</p>
+<p>There's more about how the cost of an algorithm is described in industry, using a widely agreed on convention called 'Big-O Notation', in the <a href="chapters/algorithms.html#the-whole-story">"The whole story!"</a> section at the end of this chapter.</p>
+</div>
 </div>
 <div class="panel panel-extra-for-experts panel-expanded-always">
- <div class="panel-header">
-  <strong>
-   Lorem ipsum:
-  </strong>
-  Nunc non accumsan
- </div>
- <div class="panel-body">
-  <p>
-   Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc non accumsan libero, et suscipit velit. Phasellus quis lorem eget lacus rutrum lobortis. Integer tincidunt convallis arcu a porttitor. Ut urna sapien, egestas mollis lectus a, suscipit placerat ante. Vestibulum id congue tellus. Nullam dapibus felis eu ligula mattis, vel consectetur nibh aliquet. Maecenas nec elit orci. Curabitur ut massa maximus, ultrices diam at, porttitor erat. Praesent eu purus vitae ligula elementum iaculis in non eros. Quisque eu aliquet dolor, ut pharetra lacus.
-  </p>
- </div>
+<div class="panel-header">
+<strong>Lorem ipsum:</strong> Nunc non accumsan
+</div>
+<div class="panel-body">
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc non accumsan libero, et suscipit velit. Phasellus quis lorem eget lacus rutrum lobortis. Integer tincidunt convallis arcu a porttitor. Ut urna sapien, egestas mollis lectus a, suscipit placerat ante. Vestibulum id congue tellus. Nullam dapibus felis eu ligula mattis, vel consectetur nibh aliquet. Maecenas nec elit orci. Curabitur ut massa maximus, ultrices diam at, porttitor erat. Praesent eu purus vitae ligula elementum iaculis in non eros. Quisque eu aliquet dolor, ut pharetra lacus.</p>
+</div>
 </div>
 <div class="panel panel-extra-for-experts">
- <div class="panel-header">
-  <strong>
-   Lorem ipsum:
-  </strong>
-  Nunc non accumsan
- </div>
- <div class="panel-body">
-  <p>
-   Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc non accumsan libero, et suscipit velit. Phasellus quis lorem eget lacus rutrum lobortis. Integer tincidunt convallis arcu a porttitor. Ut urna sapien, egestas mollis lectus a, suscipit placerat ante. Vestibulum id congue tellus. Nullam dapibus felis eu ligula mattis, vel consectetur nibh aliquet. Maecenas nec elit orci. Curabitur ut massa maximus, ultrices diam at, porttitor erat. Praesent eu purus vitae ligula elementum iaculis in non eros. Quisque eu aliquet dolor, ut pharetra lacus.
-  </p>
- </div>
+<div class="panel-header">
+<strong>Lorem ipsum:</strong> Nunc non accumsan
+</div>
+<div class="panel-body">
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc non accumsan libero, et suscipit velit. Phasellus quis lorem eget lacus rutrum lobortis. Integer tincidunt convallis arcu a porttitor. Ut urna sapien, egestas mollis lectus a, suscipit placerat ante. Vestibulum id congue tellus. Nullam dapibus felis eu ligula mattis, vel consectetur nibh aliquet. Maecenas nec elit orci. Curabitur ut massa maximus, ultrices diam at, porttitor erat. Praesent eu purus vitae ligula elementum iaculis in non eros. Quisque eu aliquet dolor, ut pharetra lacus.</p>
+</div>
 </div>
diff --git a/verto/tests/assets/panel/doc_example_basic_usage_expected.html b/verto/tests/assets/panel/doc_example_basic_usage_expected.html
index 0bc256e5..125435a5 100644
--- a/verto/tests/assets/panel/doc_example_basic_usage_expected.html
+++ b/verto/tests/assets/panel/doc_example_basic_usage_expected.html
@@ -1,13 +1,8 @@
 <div class="panel panel-teacher-note">
- <div class="panel-header">
-  <strong>
-   Teacher Note:
-  </strong>
-  Curriculum guides for Algorithms
- </div>
- <div class="panel-body">
-  <p>
-   This text is the panel's contents.
-  </p>
- </div>
+<div class="panel-header">
+<strong>Teacher Note:</strong> Curriculum guides for Algorithms
+</div>
+<div class="panel-body">
+<p>This text is the panel's contents.</p>
+</div>
 </div>
diff --git a/verto/tests/assets/panel/doc_example_override_html_expected.html b/verto/tests/assets/panel/doc_example_override_html_expected.html
index 86407bb5..d87dddf9 100644
--- a/verto/tests/assets/panel/doc_example_override_html_expected.html
+++ b/verto/tests/assets/panel/doc_example_override_html_expected.html
@@ -1,16 +1,12 @@
 <div class="card">
- <div class="card-header">
-  <h5 class="mb-0">
-   <strong>
-    Note
-   </strong>
-  </h5>
- </div>
- <div class="collapse show">
-  <div class="card-block">
-   <p>
-    This panel uses Bootstrap 4 card structure.
-   </p>
-  </div>
- </div>
+<div class="card-header">
+<h5 class="mb-0">
+<strong>Note</strong>
+</h5>
+</div>
+<div class="collapse show">
+<div class="card-block">
+<p>This panel uses Bootstrap 4 card structure.</p>
+</div>
+</div>
 </div>
diff --git a/verto/tests/assets/panel/doc_example_override_html_template.html b/verto/tests/assets/panel/doc_example_override_html_template.html
index e406a40d..da299d77 100644
--- a/verto/tests/assets/panel/doc_example_override_html_template.html
+++ b/verto/tests/assets/panel/doc_example_override_html_template.html
@@ -1,12 +1,12 @@
 <div class="card">
-  <div class="card-header">
-    <h5 class="mb-0">
-      <strong>{{ title }}{% if subtitle %}:</strong> {{ subtitle }}{% else %}</strong>{% endif %}
-    </h5>
-  </div>
-  <div class="collapse{% if expanded == 'always'%} show-always{% elif expanded == 'true' %} show{% endif %}">
-    <div class="card-block">
-      {{ content }}
-    </div>
-  </div>
+<div class="card-header">
+<h5 class="mb-0">
+<strong>{{ title }}{% if subtitle %}:</strong> {{ subtitle }}{% else %}</strong>{% endif %}
+</h5>
+</div>
+<div class="collapse{% if expanded == 'always'%} show-always{% elif expanded == 'true' %} show{% endif %}">
+<div class="card-block">
+{{ content }}
+</div>
+</div>
 </div>
diff --git a/verto/tests/assets/panel/panel_in_numbered_list_expected.html b/verto/tests/assets/panel/panel_in_numbered_list_expected.html
index e1d20342..eb5e30c6 100644
--- a/verto/tests/assets/panel/panel_in_numbered_list_expected.html
+++ b/verto/tests/assets/panel/panel_in_numbered_list_expected.html
@@ -1,41 +1,24 @@
 <ol>
- <li>
-  <p>
-   Lipsum
-  </p>
-  <ul>
-   <li>
-    Ichi
-   </li>
-   <li>
-    Ni
-   </li>
-   <li>
-    San
-   </li>
-  </ul>
- </li>
- <li>
-  <p>
-   Lorem
-  </p>
-  <div class="panel panel-teacher-note">
-   <div class="panel-header">
-    <strong>
-     Teacher Note:
-    </strong>
-    Curriculum guides for Algorithms
-   </div>
-   <div class="panel-body">
-    <p>
-     This text is the panel's contents.
-    </p>
-   </div>
-  </div>
- </li>
- <li>
-  <p>
-   Ipsem
-  </p>
- </li>
+<li>
+<p>Lipsum</p>
+<ul>
+<li>Ichi</li>
+<li>Ni</li>
+<li>San</li>
+</ul>
+</li>
+<li>
+<p>Lorem</p>
+<div class="panel panel-teacher-note">
+<div class="panel-header">
+<strong>Teacher Note:</strong> Curriculum guides for Algorithms
+</div>
+<div class="panel-body">
+<p>This text is the panel's contents.</p>
+</div>
+</div>
+</li>
+<li>
+<p>Ipsem</p>
+</li>
 </ol>
diff --git a/verto/tests/assets/panel/panel_only_in_numbered_list_expected.html b/verto/tests/assets/panel/panel_only_in_numbered_list_expected.html
index 323f8f0d..dedf9187 100644
--- a/verto/tests/assets/panel/panel_only_in_numbered_list_expected.html
+++ b/verto/tests/assets/panel/panel_only_in_numbered_list_expected.html
@@ -1,38 +1,23 @@
 <ol>
- <li>
-  <p>
-   Lipsum
-  </p>
-  <ul>
-   <li>
-    Ichi
-   </li>
-   <li>
-    Ni
-   </li>
-   <li>
-    San
-   </li>
-  </ul>
- </li>
- <li>
-  <div class="panel panel-teacher-note">
-   <div class="panel-header">
-    <strong>
-     Teacher Note:
-    </strong>
-    Curriculum guides for Algorithms
-   </div>
-   <div class="panel-body">
-    <p>
-     This text is the panel's contents.
-    </p>
-   </div>
-  </div>
- </li>
- <li>
-  <p>
-   Ipsem
-  </p>
- </li>
+<li>
+<p>Lipsum</p>
+<ul>
+<li>Ichi</li>
+<li>Ni</li>
+<li>San</li>
+</ul>
+</li>
+<li>
+<div class="panel panel-teacher-note">
+<div class="panel-header">
+<strong>Teacher Note:</strong> Curriculum guides for Algorithms
+</div>
+<div class="panel-body">
+<p>This text is the panel's contents.</p>
+</div>
+</div>
+</li>
+<li>
+<p>Ipsem</p>
+</li>
 </ol>
diff --git a/verto/tests/assets/panel/parses_always_expanded_panel_expected.html b/verto/tests/assets/panel/parses_always_expanded_panel_expected.html
index 695649cb..77d01a3b 100644
--- a/verto/tests/assets/panel/parses_always_expanded_panel_expected.html
+++ b/verto/tests/assets/panel/parses_always_expanded_panel_expected.html
@@ -1,13 +1,8 @@
 <div class="panel panel-extra-for-experts panel-expanded-always">
- <div class="panel-header">
-  <strong>
-   Lorem ipsum:
-  </strong>
-  Nunc non accumsan
- </div>
- <div class="panel-body">
-  <p>
-   Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc non accumsan libero, et suscipit velit. Phasellus quis lorem eget lacus rutrum lobortis. Integer tincidunt convallis arcu a porttitor. Ut urna sapien, egestas mollis lectus a, suscipit placerat ante. Vestibulum id congue tellus. Nullam dapibus felis eu ligula mattis, vel consectetur nibh aliquet. Maecenas nec elit orci. Curabitur ut massa maximus, ultrices diam at, porttitor erat. Praesent eu purus vitae ligula elementum iaculis in non eros. Quisque eu aliquet dolor, ut pharetra lacus.
-  </p>
- </div>
+<div class="panel-header">
+<strong>Lorem ipsum:</strong> Nunc non accumsan
+</div>
+<div class="panel-body">
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc non accumsan libero, et suscipit velit. Phasellus quis lorem eget lacus rutrum lobortis. Integer tincidunt convallis arcu a porttitor. Ut urna sapien, egestas mollis lectus a, suscipit placerat ante. Vestibulum id congue tellus. Nullam dapibus felis eu ligula mattis, vel consectetur nibh aliquet. Maecenas nec elit orci. Curabitur ut massa maximus, ultrices diam at, porttitor erat. Praesent eu purus vitae ligula elementum iaculis in non eros. Quisque eu aliquet dolor, ut pharetra lacus.</p>
+</div>
 </div>
diff --git a/verto/tests/assets/panel/parses_blank_lines_multiple_paragraphs_expected.html b/verto/tests/assets/panel/parses_blank_lines_multiple_paragraphs_expected.html
index eb1ca05e..17e6a2c9 100644
--- a/verto/tests/assets/panel/parses_blank_lines_multiple_paragraphs_expected.html
+++ b/verto/tests/assets/panel/parses_blank_lines_multiple_paragraphs_expected.html
@@ -1,31 +1,14 @@
 <div class="panel panel-extra-for-experts">
- <div class="panel-header">
-  <strong>
-   Lorem ipsum:
-  </strong>
-  Nunc non accumsan
- </div>
- <div class="panel-body">
-  <p>
-   Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean blandit, eros a tristique laoreet, massa enim vehicula sapien, ut convallis eros leo consectetur nunc. Praesent eu arcu nec elit maximus gravida. Proin volutpat blandit ipsum, ac ullamcorper est hendrerit a. Sed quis commodo enim, quis ornare nunc. Donec convallis nibh in tellus tempor, vitae molestie nisl commodo. Phasellus in odio ac ligula dapibus rhoncus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nulla pretium tellus vitae leo pretium, id sollicitudin sem laoreet. Duis egestas cursus dui et volutpat. Suspendisse malesuada sed nisl a eleifend. Donec mattis metus erat, volutpat luctus purus maximus ut. Donec porttitor nibh viverra dui scelerisque lobortis. Cras at tincidunt lorem. Duis imperdiet rutrum mi, non molestie velit. Nunc eget lobortis libero, at vulputate risus. Maecenas posuere ante mi, eu interdum libero vestibulum vel.
-  </p>
-  <p>
-   Nunc ante ex, scelerisque vitae congue a, pulvinar ac mi. Etiam facilisis nisl quis lectus rhoncus, quis rutrum ipsum tempus. Morbi at ullamcorper felis. Vestibulum non consequat sem. Donec pharetra lorem purus, sit amet porttitor metus tristique a. Morbi mattis consectetur iaculis. Nullam ut imperdiet tortor, eget commodo odio.
-  </p>
-  <p>
-   Maecenas mauris sapien, cursus non dictum a, blandit eget dui. Pellentesque neque diam, condimentum quis aliquet ac, laoreet eget ante. Suspendisse sem leo, molestie sed gravida sed, feugiat ac neque. Fusce faucibus sagittis ipsum et suscipit. Suspendisse fringilla viverra mauris ut commodo. Morbi mollis sem vel nunc efficitur luctus. Proin scelerisque euismod magna, eget vulputate nunc efficitur vitae. Pellentesque ullamcorper enim in orci finibus porta. Nullam tempus vitae libero in molestie. Nulla maximus dapibus tortor. Nam consectetur venenatis massa, vel sagittis libero. Nam felis nulla, mollis iaculis laoreet ut, sodales at libero. Donec mattis molestie risus id vestibulum.
-  </p>
-  <p>
-   Cras commodo sagittis tempus. Donec eu nulla nec lorem laoreet varius. Pellentesque feugiat eu nunc quis mattis. Vivamus interdum scelerisque velit in efficitur. Integer lacus eros, maximus sit amet bibendum nec, semper vel felis. Aliquam euismod magna est, nec lobortis arcu imperdiet tincidunt. Ut cursus lorem id ligula commodo finibus. Suspendisse sed felis vitae mi semper laoreet.
-  </p>
-  <p>
-   Vestibulum magna diam, blandit sed nisi in, ornare molestie nibh. Nam lectus dolor, aliquet a libero et, luctus tempor magna. Nulla sodales sapien feugiat sollicitudin ultricies. Aliquam ultricies, ipsum quis congue iaculis, lectus sem facilisis tortor, id sagittis ipsum sapien blandit ligula. Proin tincidunt volutpat risus, sit amet efficitur massa faucibus ac. Nulla eleifend erat sit amet felis finibus dapibus. Vivamus id lectus nisl. Maecenas fermentum sit amet lacus id ullamcorper.
-  </p>
-  <p>
-   Proin suscipit mollis lorem ut commodo. Donec auctor dignissim nunc in vulputate. Praesent facilisis justo id dui tempor luctus. Sed accumsan enim in massa cursus ornare. Sed magna metus, ornare nec ipsum et, imperdiet mollis lacus. Nulla facilisi. Nam id magna nibh. Curabitur iaculis tortor vel ex consequat, nec maximus erat lobortis. Morbi pretium rutrum fringilla. Vivamus velit ante, tincidunt ut quam ut, tempor accumsan ante. Curabitur in erat sed ligula facilisis cursus a eget nisl. Donec eget tincidunt arcu, vel sodales risus. Suspendisse potenti. Phasellus et massa faucibus, mattis nunc at, rutrum lacus. Quisque rutrum placerat finibus.
-  </p>
-  <p>
-   Aliquam nec ipsum id est suscipit ullamcorper. Sed facilisis quis leo vel efficitur. In ex ex, ultrices sed bibendum quis, lacinia ac augue. Quisque ut felis sed nisi iaculis porta et quis felis. Duis arcu magna, fringilla sit amet dui nec, iaculis auctor eros. Integer finibus gravida nisl eu volutpat. Sed nec volutpat eros. Suspendisse efficitur ipsum sem, venenatis laoreet neque euismod in. Integer fringilla commodo vehicula. Phasellus feugiat mi libero. Nullam posuere laoreet tincidunt. Integer mattis ipsum sit amet neque consequat rhoncus. Aliquam pulvinar posuere ante, in ultricies mi.
-  </p>
- </div>
+<div class="panel-header">
+<strong>Lorem ipsum:</strong> Nunc non accumsan
+</div>
+<div class="panel-body">
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean blandit, eros a tristique laoreet, massa enim vehicula sapien, ut convallis eros leo consectetur nunc. Praesent eu arcu nec elit maximus gravida. Proin volutpat blandit ipsum, ac ullamcorper est hendrerit a. Sed quis commodo enim, quis ornare nunc. Donec convallis nibh in tellus tempor, vitae molestie nisl commodo. Phasellus in odio ac ligula dapibus rhoncus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nulla pretium tellus vitae leo pretium, id sollicitudin sem laoreet. Duis egestas cursus dui et volutpat. Suspendisse malesuada sed nisl a eleifend. Donec mattis metus erat, volutpat luctus purus maximus ut. Donec porttitor nibh viverra dui scelerisque lobortis. Cras at tincidunt lorem. Duis imperdiet rutrum mi, non molestie velit. Nunc eget lobortis libero, at vulputate risus. Maecenas posuere ante mi, eu interdum libero vestibulum vel.</p>
+<p>Nunc ante ex, scelerisque vitae congue a, pulvinar ac mi. Etiam facilisis nisl quis lectus rhoncus, quis rutrum ipsum tempus. Morbi at ullamcorper felis. Vestibulum non consequat sem. Donec pharetra lorem purus, sit amet porttitor metus tristique a. Morbi mattis consectetur iaculis. Nullam ut imperdiet tortor, eget commodo odio.</p>
+<p>Maecenas mauris sapien, cursus non dictum a, blandit eget dui. Pellentesque neque diam, condimentum quis aliquet ac, laoreet eget ante. Suspendisse sem leo, molestie sed gravida sed, feugiat ac neque. Fusce faucibus sagittis ipsum et suscipit. Suspendisse fringilla viverra mauris ut commodo. Morbi mollis sem vel nunc efficitur luctus. Proin scelerisque euismod magna, eget vulputate nunc efficitur vitae. Pellentesque ullamcorper enim in orci finibus porta. Nullam tempus vitae libero in molestie. Nulla maximus dapibus tortor. Nam consectetur venenatis massa, vel sagittis libero. Nam felis nulla, mollis iaculis laoreet ut, sodales at libero. Donec mattis molestie risus id vestibulum.</p>
+<p>Cras commodo sagittis tempus. Donec eu nulla nec lorem laoreet varius. Pellentesque feugiat eu nunc quis mattis. Vivamus interdum scelerisque velit in efficitur. Integer lacus eros, maximus sit amet bibendum nec, semper vel felis. Aliquam euismod magna est, nec lobortis arcu imperdiet tincidunt. Ut cursus lorem id ligula commodo finibus. Suspendisse sed felis vitae mi semper laoreet.</p>
+<p>Vestibulum magna diam, blandit sed nisi in, ornare molestie nibh. Nam lectus dolor, aliquet a libero et, luctus tempor magna. Nulla sodales sapien feugiat sollicitudin ultricies. Aliquam ultricies, ipsum quis congue iaculis, lectus sem facilisis tortor, id sagittis ipsum sapien blandit ligula. Proin tincidunt volutpat risus, sit amet efficitur massa faucibus ac. Nulla eleifend erat sit amet felis finibus dapibus. Vivamus id lectus nisl. Maecenas fermentum sit amet lacus id ullamcorper.</p>
+<p>Proin suscipit mollis lorem ut commodo. Donec auctor dignissim nunc in vulputate. Praesent facilisis justo id dui tempor luctus. Sed accumsan enim in massa cursus ornare. Sed magna metus, ornare nec ipsum et, imperdiet mollis lacus. Nulla facilisi. Nam id magna nibh. Curabitur iaculis tortor vel ex consequat, nec maximus erat lobortis. Morbi pretium rutrum fringilla. Vivamus velit ante, tincidunt ut quam ut, tempor accumsan ante. Curabitur in erat sed ligula facilisis cursus a eget nisl. Donec eget tincidunt arcu, vel sodales risus. Suspendisse potenti. Phasellus et massa faucibus, mattis nunc at, rutrum lacus. Quisque rutrum placerat finibus.</p>
+<p>Aliquam nec ipsum id est suscipit ullamcorper. Sed facilisis quis leo vel efficitur. In ex ex, ultrices sed bibendum quis, lacinia ac augue. Quisque ut felis sed nisi iaculis porta et quis felis. Duis arcu magna, fringilla sit amet dui nec, iaculis auctor eros. Integer finibus gravida nisl eu volutpat. Sed nec volutpat eros. Suspendisse efficitur ipsum sem, venenatis laoreet neque euismod in. Integer fringilla commodo vehicula. Phasellus feugiat mi libero. Nullam posuere laoreet tincidunt. Integer mattis ipsum sit amet neque consequat rhoncus. Aliquam pulvinar posuere ante, in ultricies mi.</p>
+</div>
 </div>
diff --git a/verto/tests/assets/panel/parses_expanded_panel_expected.html b/verto/tests/assets/panel/parses_expanded_panel_expected.html
index e26a174f..bf277273 100644
--- a/verto/tests/assets/panel/parses_expanded_panel_expected.html
+++ b/verto/tests/assets/panel/parses_expanded_panel_expected.html
@@ -1,13 +1,8 @@
 <div class="panel panel-extra-for-experts panel-expanded">
- <div class="panel-header">
-  <strong>
-   Lorem ipsum:
-  </strong>
-  Nunc non accumsan
- </div>
- <div class="panel-body">
-  <p>
-   Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc non accumsan libero, et suscipit velit. Phasellus quis lorem eget lacus rutrum lobortis. Integer tincidunt convallis arcu a porttitor. Ut urna sapien, egestas mollis lectus a, suscipit placerat ante. Vestibulum id congue tellus. Nullam dapibus felis eu ligula mattis, vel consectetur nibh aliquet. Maecenas nec elit orci. Curabitur ut massa maximus, ultrices diam at, porttitor erat. Praesent eu purus vitae ligula elementum iaculis in non eros. Quisque eu aliquet dolor, ut pharetra lacus.
-  </p>
- </div>
+<div class="panel-header">
+<strong>Lorem ipsum:</strong> Nunc non accumsan
+</div>
+<div class="panel-body">
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc non accumsan libero, et suscipit velit. Phasellus quis lorem eget lacus rutrum lobortis. Integer tincidunt convallis arcu a porttitor. Ut urna sapien, egestas mollis lectus a, suscipit placerat ante. Vestibulum id congue tellus. Nullam dapibus felis eu ligula mattis, vel consectetur nibh aliquet. Maecenas nec elit orci. Curabitur ut massa maximus, ultrices diam at, porttitor erat. Praesent eu purus vitae ligula elementum iaculis in non eros. Quisque eu aliquet dolor, ut pharetra lacus.</p>
+</div>
 </div>
diff --git a/verto/tests/assets/panel/parses_no_blank_lines_single_paragraph_expected.html b/verto/tests/assets/panel/parses_no_blank_lines_single_paragraph_expected.html
index 52c8a946..a9aa7acf 100644
--- a/verto/tests/assets/panel/parses_no_blank_lines_single_paragraph_expected.html
+++ b/verto/tests/assets/panel/parses_no_blank_lines_single_paragraph_expected.html
@@ -1,13 +1,8 @@
 <div class="panel panel-extra-for-experts">
- <div class="panel-header">
-  <strong>
-   Lorem ipsum:
-  </strong>
-  Nunc non accumsan
- </div>
- <div class="panel-body">
-  <p>
-   Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc non accumsan libero, et suscipit velit. Phasellus quis lorem eget lacus rutrum lobortis. Integer tincidunt convallis arcu a porttitor. Ut urna sapien, egestas mollis lectus a, suscipit placerat ante. Vestibulum id congue tellus. Nullam dapibus felis eu ligula mattis, vel consectetur nibh aliquet. Maecenas nec elit orci. Curabitur ut massa maximus, ultrices diam at, porttitor erat. Praesent eu purus vitae ligula elementum iaculis in non eros. Quisque eu aliquet dolor, ut pharetra lacus.
-  </p>
- </div>
+<div class="panel-header">
+<strong>Lorem ipsum:</strong> Nunc non accumsan
+</div>
+<div class="panel-body">
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc non accumsan libero, et suscipit velit. Phasellus quis lorem eget lacus rutrum lobortis. Integer tincidunt convallis arcu a porttitor. Ut urna sapien, egestas mollis lectus a, suscipit placerat ante. Vestibulum id congue tellus. Nullam dapibus felis eu ligula mattis, vel consectetur nibh aliquet. Maecenas nec elit orci. Curabitur ut massa maximus, ultrices diam at, porttitor erat. Praesent eu purus vitae ligula elementum iaculis in non eros. Quisque eu aliquet dolor, ut pharetra lacus.</p>
+</div>
 </div>
diff --git a/verto/tests/assets/relative-link/doc_example_basic_usage_expected.html b/verto/tests/assets/relative-link/doc_example_basic_usage_expected.html
index 07090622..f165b2a9 100644
--- a/verto/tests/assets/relative-link/doc_example_basic_usage_expected.html
+++ b/verto/tests/assets/relative-link/doc_example_basic_usage_expected.html
@@ -1,7 +1 @@
-<p>
- Check out this
- <a href="{{ base_path }}resource/134">
-  resource
- </a>
- .
-</p>
+<p>Check out this <a href="{{ base_path }}resource/134">resource</a>.</p>
diff --git a/verto/tests/assets/relative-link/ftp_schema_expected.html b/verto/tests/assets/relative-link/ftp_schema_expected.html
index d070b8f1..4f9df1f7 100644
--- a/verto/tests/assets/relative-link/ftp_schema_expected.html
+++ b/verto/tests/assets/relative-link/ftp_schema_expected.html
@@ -1,7 +1 @@
-<p>
- Check out this
- <a href="ftp://ftp.fakesite.org:21">
-  website
- </a>
- .
-</p>
+<p>Check out this <a href="ftp://ftp.fakesite.org:21">website</a>.</p>
diff --git a/verto/tests/assets/relative-link/ftp_text_expected.html b/verto/tests/assets/relative-link/ftp_text_expected.html
index 6feb9dc3..9c05a061 100644
--- a/verto/tests/assets/relative-link/ftp_text_expected.html
+++ b/verto/tests/assets/relative-link/ftp_text_expected.html
@@ -1,7 +1 @@
-<p>
- Check out this
- <a href="{{ base_path }}ftp/item.html">
-  item
- </a>
- .
-</p>
+<p>Check out this <a href="{{ base_path }}ftp/item.html">item</a>.</p>
diff --git a/verto/tests/assets/relative-link/ftps_schema_expected.html b/verto/tests/assets/relative-link/ftps_schema_expected.html
index f7953afc..fc7b46d6 100644
--- a/verto/tests/assets/relative-link/ftps_schema_expected.html
+++ b/verto/tests/assets/relative-link/ftps_schema_expected.html
@@ -1,7 +1 @@
-<p>
- Check out this
- <a href="ftps://ftp.fakesite.org:21">
-  website
- </a>
- .
-</p>
+<p>Check out this <a href="ftps://ftp.fakesite.org:21">website</a>.</p>
diff --git a/verto/tests/assets/relative-link/ftps_text_expected.html b/verto/tests/assets/relative-link/ftps_text_expected.html
index 356bc1ab..d0307f9e 100644
--- a/verto/tests/assets/relative-link/ftps_text_expected.html
+++ b/verto/tests/assets/relative-link/ftps_text_expected.html
@@ -1,7 +1 @@
-<p>
- Check out this
- <a href="{{ base_path }}ftps/item.html">
-  item
- </a>
- .
-</p>
+<p>Check out this <a href="{{ base_path }}ftps/item.html">item</a>.</p>
diff --git a/verto/tests/assets/relative-link/http_schema_expected.html b/verto/tests/assets/relative-link/http_schema_expected.html
index 0c8c9091..1028833c 100644
--- a/verto/tests/assets/relative-link/http_schema_expected.html
+++ b/verto/tests/assets/relative-link/http_schema_expected.html
@@ -1,7 +1 @@
-<p>
- Check out this
- <a href="http://www.google.com">
-  website
- </a>
- .
-</p>
+<p>Check out this <a href="http://www.google.com">website</a>.</p>
diff --git a/verto/tests/assets/relative-link/http_text_expected.html b/verto/tests/assets/relative-link/http_text_expected.html
index 52e8c74b..e87c14f3 100644
--- a/verto/tests/assets/relative-link/http_text_expected.html
+++ b/verto/tests/assets/relative-link/http_text_expected.html
@@ -1,7 +1 @@
-<p>
- Check out this
- <a href="{{ base_path }}http.html">
-  website
- </a>
- .
-</p>
+<p>Check out this <a href="{{ base_path }}http.html">website</a>.</p>
diff --git a/verto/tests/assets/relative-link/https_schema_expected.html b/verto/tests/assets/relative-link/https_schema_expected.html
index ab5b05ba..b937ab2e 100644
--- a/verto/tests/assets/relative-link/https_schema_expected.html
+++ b/verto/tests/assets/relative-link/https_schema_expected.html
@@ -1,7 +1 @@
-<p>
- Check out this
- <a href="https://www.google.com">
-  website
- </a>
- .
-</p>
+<p>Check out this <a href="https://www.google.com">website</a>.</p>
diff --git a/verto/tests/assets/relative-link/https_text_expected.html b/verto/tests/assets/relative-link/https_text_expected.html
index ed477a18..58656574 100644
--- a/verto/tests/assets/relative-link/https_text_expected.html
+++ b/verto/tests/assets/relative-link/https_text_expected.html
@@ -1,7 +1 @@
-<p>
- Check out this
- <a href="{{ base_path }}https.html">
-  website
- </a>
- .
-</p>
+<p>Check out this <a href="{{ base_path }}https.html">website</a>.</p>
diff --git a/verto/tests/assets/relative-link/long_path_expected.html b/verto/tests/assets/relative-link/long_path_expected.html
index aa4fdef6..098851fd 100644
--- a/verto/tests/assets/relative-link/long_path_expected.html
+++ b/verto/tests/assets/relative-link/long_path_expected.html
@@ -1,7 +1 @@
-<p>
- Check out this
- <a href="{{ base_path }}resource/activity/sheet/page/2">
-  resource
- </a>
- .
-</p>
+<p>Check out this <a href="{{ base_path }}resource/activity/sheet/page/2">resource</a>.</p>
diff --git a/verto/tests/assets/relative-link/mailto_schema_expected.html b/verto/tests/assets/relative-link/mailto_schema_expected.html
index 3d13e3eb..3f463551 100644
--- a/verto/tests/assets/relative-link/mailto_schema_expected.html
+++ b/verto/tests/assets/relative-link/mailto_schema_expected.html
@@ -1,7 +1 @@
-<p>
- Check out this
- <a href="mailto:bob@example.com">
-  email
- </a>
- .
-</p>
+<p>Check out this <a href="mailto:bob@example.com">email</a>.</p>
diff --git a/verto/tests/assets/relative-link/mailto_text_expected.html b/verto/tests/assets/relative-link/mailto_text_expected.html
index 64576c34..22dc0d3b 100644
--- a/verto/tests/assets/relative-link/mailto_text_expected.html
+++ b/verto/tests/assets/relative-link/mailto_text_expected.html
@@ -1,7 +1 @@
-<p>
- Check out this
- <a href="{{ base_path }}mailto.html">
-  page
- </a>
- .
-</p>
+<p>Check out this <a href="{{ base_path }}mailto.html">page</a>.</p>
diff --git a/verto/tests/assets/relative-link/multiple_links_expected.html b/verto/tests/assets/relative-link/multiple_links_expected.html
index e6316d26..faba0bac 100644
--- a/verto/tests/assets/relative-link/multiple_links_expected.html
+++ b/verto/tests/assets/relative-link/multiple_links_expected.html
@@ -1,18 +1,2 @@
-<p>
- This is the
- <a href="{{ base_path }}link_1.html">
-  first link
- </a>
- and this is the
- <a href="{{ base_path }}link_2.html">
-  second link
- </a>
- .
-</p>
-<p>
- This is the
- <a href="{{ base_path }}more/link_3.html">
-  third link
- </a>
- .
-</p>
+<p>This is the <a href="{{ base_path }}link_1.html">first link</a> and this is the <a href="{{ base_path }}link_2.html">second link</a>.</p>
+<p>This is the <a href="{{ base_path }}more/link_3.html">third link</a>.</p>
diff --git a/verto/tests/assets/relative-link/news_schema_expected.html b/verto/tests/assets/relative-link/news_schema_expected.html
index 4867ec58..ea1cc5f9 100644
--- a/verto/tests/assets/relative-link/news_schema_expected.html
+++ b/verto/tests/assets/relative-link/news_schema_expected.html
@@ -1,7 +1 @@
-<p>
- Check out this
- <a href="news://feed.news.com">
-  news
- </a>
- .
-</p>
+<p>Check out this <a href="news://feed.news.com">news</a>.</p>
diff --git a/verto/tests/assets/relative-link/news_text_expected.html b/verto/tests/assets/relative-link/news_text_expected.html
index 2d0d0257..a9df4f86 100644
--- a/verto/tests/assets/relative-link/news_text_expected.html
+++ b/verto/tests/assets/relative-link/news_text_expected.html
@@ -1,7 +1 @@
-<p>
- Check out this
- <a href="{{ base_path }}news">
-  news
- </a>
- .
-</p>
+<p>Check out this <a href="{{ base_path }}news">news</a>.</p>
diff --git a/verto/tests/assets/relative-link/www_text_expected.html b/verto/tests/assets/relative-link/www_text_expected.html
index a8d8ec29..8670b5a5 100644
--- a/verto/tests/assets/relative-link/www_text_expected.html
+++ b/verto/tests/assets/relative-link/www_text_expected.html
@@ -1,7 +1 @@
-<p>
- Check out this
- <a href="{{ base_path }}www.google.com">
-  website
- </a>
- .
-</p>
+<p>Check out this <a href="{{ base_path }}www.google.com">website</a>.</p>
diff --git a/verto/tests/assets/remove-title/doc_example_basic_usage_expected.html b/verto/tests/assets/remove-title/doc_example_basic_usage_expected.html
index fa350fcc..02e0996f 100644
--- a/verto/tests/assets/remove-title/doc_example_basic_usage_expected.html
+++ b/verto/tests/assets/remove-title/doc_example_basic_usage_expected.html
@@ -1,3 +1 @@
-<p>
- This is a sentence.
-</p>
+<p>This is a sentence.</p>
diff --git a/verto/tests/assets/remove-title/level_two_heading_expected.html b/verto/tests/assets/remove-title/level_two_heading_expected.html
index fa350fcc..02e0996f 100644
--- a/verto/tests/assets/remove-title/level_two_heading_expected.html
+++ b/verto/tests/assets/remove-title/level_two_heading_expected.html
@@ -1,3 +1 @@
-<p>
- This is a sentence.
-</p>
+<p>This is a sentence.</p>
diff --git a/verto/tests/assets/remove-title/multiple_headings_expected.html b/verto/tests/assets/remove-title/multiple_headings_expected.html
index df148ddb..e1e7df19 100644
--- a/verto/tests/assets/remove-title/multiple_headings_expected.html
+++ b/verto/tests/assets/remove-title/multiple_headings_expected.html
@@ -1,21 +1,7 @@
-<p>
- This is a sentence.
-</p>
-<h2>
- Second Level Heading
-</h2>
-<p>
- This is a sentence.
-</p>
-<h3>
- Third Level Heading
-</h3>
-<p>
- This is a sentence.
-</p>
-<h4>
- Fourth Level Heading
-</h4>
-<p>
- This is a sentence.
-</p>
+<p>This is a sentence.</p>
+<h2>Second Level Heading</h2>
+<p>This is a sentence.</p>
+<h3>Third Level Heading</h3>
+<p>This is a sentence.</p>
+<h4>Fourth Level Heading</h4>
+<p>This is a sentence.</p>
diff --git a/verto/tests/assets/remove-title/multiple_level_one_headings_expected.html b/verto/tests/assets/remove-title/multiple_level_one_headings_expected.html
index 756746a5..803eda49 100644
--- a/verto/tests/assets/remove-title/multiple_level_one_headings_expected.html
+++ b/verto/tests/assets/remove-title/multiple_level_one_headings_expected.html
@@ -1,21 +1,7 @@
-<p>
- This is a sentence.
-</p>
-<h1>
- Second Level One Heading
-</h1>
-<p>
- This is a sentence.
-</p>
-<h1>
- Third Level One Heading
-</h1>
-<p>
- This is a sentence.
-</p>
-<h1>
- Fourth Level One Heading
-</h1>
-<p>
- This is a sentence.
-</p>
+<p>This is a sentence.</p>
+<h1>Second Level One Heading</h1>
+<p>This is a sentence.</p>
+<h1>Third Level One Heading</h1>
+<p>This is a sentence.</p>
+<h1>Fourth Level One Heading</h1>
+<p>This is a sentence.</p>
diff --git a/verto/tests/assets/remove-title/no_heading_permalink_expected.html b/verto/tests/assets/remove-title/no_heading_permalink_expected.html
index 19a3af22..ffd01a96 100644
--- a/verto/tests/assets/remove-title/no_heading_permalink_expected.html
+++ b/verto/tests/assets/remove-title/no_heading_permalink_expected.html
@@ -1,7 +1 @@
-<p>
- This is a sentence with a
- <a href="# invalid-link">
-  permalink
- </a>
- .
-</p>
+<p>This is a sentence with a <a href="# invalid-link">permalink</a>.</p>
diff --git a/verto/tests/assets/remove-title/no_headings_expected.html b/verto/tests/assets/remove-title/no_headings_expected.html
index 71cb5e18..71f0252e 100644
--- a/verto/tests/assets/remove-title/no_headings_expected.html
+++ b/verto/tests/assets/remove-title/no_headings_expected.html
@@ -1,9 +1,3 @@
-<p>
- This is a sentence.
-</p>
-<p>
- This is another sentence.
-</p>
-<p>
- This is a third sentence.
-</p>
+<p>This is a sentence.</p>
+<p>This is another sentence.</p>
+<p>This is a third sentence.</p>
diff --git a/verto/tests/assets/remove-title/no_space_title_expected.html b/verto/tests/assets/remove-title/no_space_title_expected.html
index fa350fcc..02e0996f 100644
--- a/verto/tests/assets/remove-title/no_space_title_expected.html
+++ b/verto/tests/assets/remove-title/no_space_title_expected.html
@@ -1,3 +1 @@
-<p>
- This is a sentence.
-</p>
+<p>This is a sentence.</p>
diff --git a/verto/tests/assets/remove-title/processor_off_expected.html b/verto/tests/assets/remove-title/processor_off_expected.html
index 5f51025c..fd0f96a3 100644
--- a/verto/tests/assets/remove-title/processor_off_expected.html
+++ b/verto/tests/assets/remove-title/processor_off_expected.html
@@ -1,6 +1,2 @@
-<h1>
- Example Title
-</h1>
-<p>
- This is a sentence.
-</p>
+<h1>Example Title</h1>
+<p>This is a sentence.</p>
diff --git a/verto/tests/assets/remove/doc_example_basic_usage.md b/verto/tests/assets/remove/doc_example_basic_usage.md
index ee260009..00c89e1b 100644
--- a/verto/tests/assets/remove/doc_example_basic_usage.md
+++ b/verto/tests/assets/remove/doc_example_basic_usage.md
@@ -1,11 +1,7 @@
 <div>
- <remove>
-  <p>
-   Content in here.
-  </p>
-  {{ Django Variable }}
-  <p>
-   Something about the variable.
-  </p>
- </remove>
+<remove>
+<p>Content in here.</p>
+{{ Django Variable }}
+<p>Something about the variable.</p>
+</remove>
 </div>
diff --git a/verto/tests/assets/remove/doc_example_basic_usage_expected.html b/verto/tests/assets/remove/doc_example_basic_usage_expected.html
index a2c7abc5..efa0aea4 100644
--- a/verto/tests/assets/remove/doc_example_basic_usage_expected.html
+++ b/verto/tests/assets/remove/doc_example_basic_usage_expected.html
@@ -1,9 +1,5 @@
 <div>
- <p>
-  Content in here.
- </p>
- {{ Django Variable }}
- <p>
-  Something about the variable.
- </p>
+<p>Content in here.</p>
+{{ Django Variable }}
+<p>Something about the variable.</p>
 </div>
diff --git a/verto/tests/assets/scratch/doc_example_basic_usage_expected.html b/verto/tests/assets/scratch/doc_example_basic_usage_expected.html
index a8b838f4..69a8511d 100644
--- a/verto/tests/assets/scratch/doc_example_basic_usage_expected.html
+++ b/verto/tests/assets/scratch/doc_example_basic_usage_expected.html
@@ -1,4 +1,4 @@
 <div class="scratch-inline-images">
- <object data="{% static 'scratch-blocks-a0f8fcad796864abfacac8bda6e0719813833fd1fca348700abbd040557c1576.svg' %}" type="image/svg+xml">
- </object>
+<object data="{% static 'scratch-blocks-a0f8fcad796864abfacac8bda6e0719813833fd1fca348700abbd040557c1576.svg' %}" type="image/svg+xml">
+</object>
 </div>
diff --git a/verto/tests/assets/scratch/doc_example_override_html_expected.html b/verto/tests/assets/scratch/doc_example_override_html_expected.html
index 0b5a143d..ab66e320 100644
--- a/verto/tests/assets/scratch/doc_example_override_html_expected.html
+++ b/verto/tests/assets/scratch/doc_example_override_html_expected.html
@@ -1,4 +1,3 @@
 <div class="scratch-inline-images">
- <img class="scratch-blocks" onerror="this.src='scratch-blocks-a3b77ed3c3fa57e43c830e338dc39d292c7def676e0e8f7545972b7da20275da.png'" src="scratch-blocks-a3b77ed3c3fa57e43c830e338dc39d292c7def676e0e8f7545972b7da20275da.svg">
- </img>
+<img class="scratch-blocks" onerror="this.src='scratch-blocks-a3b77ed3c3fa57e43c830e338dc39d292c7def676e0e8f7545972b7da20275da.png'" src="scratch-blocks-a3b77ed3c3fa57e43c830e338dc39d292c7def676e0e8f7545972b7da20275da.svg">
 </div>
diff --git a/verto/tests/assets/scratch/doc_example_override_html_template.html b/verto/tests/assets/scratch/doc_example_override_html_template.html
index 275dc10f..ab7ba3af 100644
--- a/verto/tests/assets/scratch/doc_example_override_html_template.html
+++ b/verto/tests/assets/scratch/doc_example_override_html_template.html
@@ -1,5 +1,5 @@
 <div class="scratch-inline-images">
-  {% for hash in images -%}
-    <img class="scratch-blocks" src="scratch-blocks-{{ hash }}.svg" onerror="this.src='scratch-blocks-{{ hash }}.png'"/>
-  {% endfor -%}
+{% for hash in images -%}
+<img class="scratch-blocks" src="scratch-blocks-{{ hash }}.svg" onerror="this.src='scratch-blocks-{{ hash }}.png'"/>
+{% endfor -%}
 </div>
diff --git a/verto/tests/assets/scratch/example_multiple_codeblocks_expected.html b/verto/tests/assets/scratch/example_multiple_codeblocks_expected.html
index 1508f19e..0af35204 100644
--- a/verto/tests/assets/scratch/example_multiple_codeblocks_expected.html
+++ b/verto/tests/assets/scratch/example_multiple_codeblocks_expected.html
@@ -1,21 +1,15 @@
-<p>
- Scratch is great for kids you can create simple code like:
-</p>
+<p>Scratch is great for kids you can create simple code like:</p>
 <div class="scratch-inline-images">
- <object data="{% static 'scratch-blocks-a3b77ed3c3fa57e43c830e338dc39d292c7def676e0e8f7545972b7da20275da.svg' %}" type="image/svg+xml">
- </object>
+<object data="{% static 'scratch-blocks-a3b77ed3c3fa57e43c830e338dc39d292c7def676e0e8f7545972b7da20275da.svg' %}" type="image/svg+xml">
+</object>
 </div>
-<p>
- Which then easily builds into:
-</p>
+<p>Which then easily builds into:</p>
 <div class="scratch-inline-images">
- <object data="{% static 'scratch-blocks-cd6d9a0d464bb8f5eec1e6fc9a4e33378a64ebfce7c6198794ead614962f38e5.svg' %}" type="image/svg+xml">
- </object>
+<object data="{% static 'scratch-blocks-cd6d9a0d464bb8f5eec1e6fc9a4e33378a64ebfce7c6198794ead614962f38e5.svg' %}" type="image/svg+xml">
+</object>
 </div>
-<p>
- Finally they can create complex code like so:
-</p>
+<p>Finally they can create complex code like so:</p>
 <div class="scratch-inline-images">
- <object data="{% static 'scratch-blocks-8e8a2129c3cecf32101248439961735fc1d45793fadc56e2575673f63d42b9fb.svg' %}" type="image/svg+xml">
- </object>
+<object data="{% static 'scratch-blocks-8e8a2129c3cecf32101248439961735fc1d45793fadc56e2575673f63d42b9fb.svg' %}" type="image/svg+xml">
+</object>
 </div>
diff --git a/verto/tests/assets/scratch/example_multiple_codeblocks_expected_2.html b/verto/tests/assets/scratch/example_multiple_codeblocks_expected_2.html
index 9afff2de..7e55e834 100644
--- a/verto/tests/assets/scratch/example_multiple_codeblocks_expected_2.html
+++ b/verto/tests/assets/scratch/example_multiple_codeblocks_expected_2.html
@@ -1,15 +1,13 @@
-<p>
- Scratch is great for kids you can create simple code like:
-</p>
+<p>Scratch is great for kids you can create simple code like:</p>
 <div class="scratch-inline-images">
- <object data="{% static 'scratch-blocks-a3b77ed3c3fa57e43c830e338dc39d292c7def676e0e8f7545972b7da20275da.svg' %}" type="image/svg+xml">
- </object>
+<object data="{% static 'scratch-blocks-a3b77ed3c3fa57e43c830e338dc39d292c7def676e0e8f7545972b7da20275da.svg' %}" type="image/svg+xml">
+</object>
 </div>
 <div class="scratch-inline-images">
- <object data="{% static 'scratch-blocks-cd6d9a0d464bb8f5eec1e6fc9a4e33378a64ebfce7c6198794ead614962f38e5.svg' %}" type="image/svg+xml">
- </object>
+<object data="{% static 'scratch-blocks-cd6d9a0d464bb8f5eec1e6fc9a4e33378a64ebfce7c6198794ead614962f38e5.svg' %}" type="image/svg+xml">
+</object>
 </div>
 <div class="scratch-inline-images">
- <object data="{% static 'scratch-blocks-8e8a2129c3cecf32101248439961735fc1d45793fadc56e2575673f63d42b9fb.svg' %}" type="image/svg+xml">
- </object>
+<object data="{% static 'scratch-blocks-8e8a2129c3cecf32101248439961735fc1d45793fadc56e2575673f63d42b9fb.svg' %}" type="image/svg+xml">
+</object>
 </div>
diff --git a/verto/tests/assets/scratch/example_other_code_expected.html b/verto/tests/assets/scratch/example_other_code_expected.html
index 8138975e..1b1ac718 100644
--- a/verto/tests/assets/scratch/example_other_code_expected.html
+++ b/verto/tests/assets/scratch/example_other_code_expected.html
@@ -1,6 +1,6 @@
 <div class="scratch-inline-images">
- <object data="{% static 'scratch-blocks-a0f8fcad796864abfacac8bda6e0719813833fd1fca348700abbd040557c1576.svg' %}" type="image/svg+xml">
- </object>
+<object data="{% static 'scratch-blocks-a0f8fcad796864abfacac8bda6e0719813833fd1fca348700abbd040557c1576.svg' %}" type="image/svg+xml">
+</object>
 </div>
 <pre><code>type = True
 </code></pre>
diff --git a/verto/tests/assets/scratch/example_separate_blocks_expected.html b/verto/tests/assets/scratch/example_separate_blocks_expected.html
index e79b712d..0a80a2ac 100644
--- a/verto/tests/assets/scratch/example_separate_blocks_expected.html
+++ b/verto/tests/assets/scratch/example_separate_blocks_expected.html
@@ -1,4 +1,4 @@
 <div class="scratch-inline-images">
- <object data="{% static 'scratch-blocks-8e8a2129c3cecf32101248439961735fc1d45793fadc56e2575673f63d42b9fb.svg' %}" type="image/svg+xml">
- </object>
+<object data="{% static 'scratch-blocks-8e8a2129c3cecf32101248439961735fc1d45793fadc56e2575673f63d42b9fb.svg' %}" type="image/svg+xml">
+</object>
 </div>
diff --git a/verto/tests/assets/scratch/example_split_codeblocks_expected.html b/verto/tests/assets/scratch/example_split_codeblocks_expected.html
index df6997f6..b41c56d0 100644
--- a/verto/tests/assets/scratch/example_split_codeblocks_expected.html
+++ b/verto/tests/assets/scratch/example_split_codeblocks_expected.html
@@ -1,11 +1,9 @@
-<p>
- Scratch is great for kids you can great simple code like:
-</p>
+<p>Scratch is great for kids you can great simple code like:</p>
 <div class="scratch-inline-images">
- <object data="{% static 'scratch-blocks-a3b77ed3c3fa57e43c830e338dc39d292c7def676e0e8f7545972b7da20275da.svg' %}" type="image/svg+xml">
- </object>
- <object data="{% static 'scratch-blocks-cd6d9a0d464bb8f5eec1e6fc9a4e33378a64ebfce7c6198794ead614962f38e5.svg' %}" type="image/svg+xml">
- </object>
- <object data="{% static 'scratch-blocks-a0f8fcad796864abfacac8bda6e0719813833fd1fca348700abbd040557c1576.svg' %}" type="image/svg+xml">
- </object>
+<object data="{% static 'scratch-blocks-a3b77ed3c3fa57e43c830e338dc39d292c7def676e0e8f7545972b7da20275da.svg' %}" type="image/svg+xml">
+</object>
+<object data="{% static 'scratch-blocks-cd6d9a0d464bb8f5eec1e6fc9a4e33378a64ebfce7c6198794ead614962f38e5.svg' %}" type="image/svg+xml">
+</object>
+<object data="{% static 'scratch-blocks-a0f8fcad796864abfacac8bda6e0719813833fd1fca348700abbd040557c1576.svg' %}" type="image/svg+xml">
+</object>
 </div>
diff --git a/verto/tests/assets/scratch/example_standard_markdown_block_expected.html b/verto/tests/assets/scratch/example_standard_markdown_block_expected.html
index 95350504..c589b3d2 100644
--- a/verto/tests/assets/scratch/example_standard_markdown_block_expected.html
+++ b/verto/tests/assets/scratch/example_standard_markdown_block_expected.html
@@ -1,7 +1,5 @@
-<p>
- Codeblock follows:
-</p>
+<p>Codeblock follows:</p>
 <div class="scratch-inline-images">
- <object data="{% static 'scratch-blocks-a0f8fcad796864abfacac8bda6e0719813833fd1fca348700abbd040557c1576.svg' %}" type="image/svg+xml">
- </object>
+<object data="{% static 'scratch-blocks-a0f8fcad796864abfacac8bda6e0719813833fd1fca348700abbd040557c1576.svg' %}" type="image/svg+xml">
+</object>
 </div>
diff --git a/verto/tests/assets/table-of-contents/doc_example_override_html_expected.html b/verto/tests/assets/table-of-contents/doc_example_override_html_expected.html
index 938b40f4..7c064e0a 100644
--- a/verto/tests/assets/table-of-contents/doc_example_override_html_expected.html
+++ b/verto/tests/assets/table-of-contents/doc_example_override_html_expected.html
@@ -1,14 +1,10 @@
 <div class="toc">
- <strong>
-  Table of Contents
- </strong>
- <ul>
-  {% for heading in headings %}
-  <li>
-   <a href="#{{ heading.id }}">
-    {{ heading.name }}
-   </a>
-  </li>
-  {% endfor %}
- </ul>
+<strong>Table of Contents</strong>
+<ul>
+{% for heading in headings %}
+<li>
+<a href="#{{ heading.id }}">{{ heading.name }}</a>
+</li>
+{% endfor %}
+</ul>
 </div>
diff --git a/verto/tests/assets/table-of-contents/doc_example_override_html_template.html b/verto/tests/assets/table-of-contents/doc_example_override_html_template.html
index c27797e3..0be987e1 100644
--- a/verto/tests/assets/table-of-contents/doc_example_override_html_template.html
+++ b/verto/tests/assets/table-of-contents/doc_example_override_html_template.html
@@ -1,10 +1,12 @@
 <div class="toc">
-  <strong>Table of Contents</strong>
-  <ul>
-    {% raw -%}
-      {% for heading in headings %}
-        <li><a href="#{{ heading.id }}">{{ heading.name }}</a></li>
-      {% endfor %}
-    {% endraw -%}
-  </ul>
+<strong>Table of Contents</strong>
+<ul>
+{% raw -%}
+{% for heading in headings %}
+<li>
+<a href="#{{ heading.id }}">{{ heading.name }}</a>
+</li>
+{% endfor %}
+{% endraw -%}
+</ul>
 </div>
diff --git a/verto/tests/assets/video/contains_multiple_videos_expected.html b/verto/tests/assets/video/contains_multiple_videos_expected.html
index f4e98ffd..dbf02d94 100644
--- a/verto/tests/assets/video/contains_multiple_videos_expected.html
+++ b/verto/tests/assets/video/contains_multiple_videos_expected.html
@@ -1,13 +1,13 @@
 <h3>Videos</h3>
 <p>There and back again: a packet's tale</p>
-<div class="video-container no-controls">
+<div>
 <iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/WwyJGzZmBe8?rel=0"></iframe>
 </div>
 <p>How does the internet work?</p>
-<div class="video-container no-controls">
+<div>
 <iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/i5oe63pOhLI?rel=0"></iframe>
 </div>
 <p>How the internet works in 5 minutes</p>
-<div class="video-container no-controls">
+<div>
 <iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/7_LPdttKXPc?rel=0"></iframe>
-</div>
\ No newline at end of file
+</div>
diff --git a/verto/tests/assets/video/contains_no_video_expected.html b/verto/tests/assets/video/contains_no_video_expected.html
index fdf3d7d8..eb5bed7b 100644
--- a/verto/tests/assets/video/contains_no_video_expected.html
+++ b/verto/tests/assets/video/contains_no_video_expected.html
@@ -1,37 +1,3 @@
-<h2>
- What's the big picture?
-</h2>
-<p>
- Artificial Intelligence conjures up all sorts of images --- perhaps you think of friendly systems that can talk to you and solve tough problems; or maniac robots that are bent on world domination? There's the promise of driverless cars that are safer than human drivers, and the worry of  medical advice systems that hold people's lives in their virtual hands. The field of Artificial Intelligence is a part of computer science that has a lot of promise and also raises a lot of concerns. It can be used to make decisions in systems as large as an aeroplane or an
- <a href="http://www.komatsu.com/CompanyInfo/profile/product_supports/">
-  autonomous dump truck
- </a>
- , or as small as a mobile phone that accurately predicts text being typed into it. What they have in common is that they try to mimic aspects of human intelligence. And importantly, such systems can be of significant help in people's everyday lives.
-</p>
-<p>
- AI (also known as intelligent systems) is primarily a branch of computer science but it has borrowed a lot of concepts and ideas from other fields, especially
- <a href="https://en.wikipedia.org/wiki/Mathematics">
-  mathematics
- </a>
- (particularly logic, combinatorics, statistics, probability and optimisation theory),
- <a href="https://en.wikipedia.org/wiki/Biology">
-  biology
- </a>
- ,
- <a href="https://en.wikipedia.org/wiki/Psychology">
-  psychology
- </a>
- ,
- <a href="https://en.wikipedia.org/wiki/Linguistics">
-  linguistics
- </a>
- ,
- <a href="https://en.wikipedia.org/wiki/Neuroscience">
-  neuroscience
- </a>
- and
- <a href="https://en.wikipedia.org/wiki/Philosophy">
-  philosophy
- </a>
- .
-</p>
\ No newline at end of file
+<h2>What's the big picture?</h2>
+<p>Artificial Intelligence conjures up all sorts of images --- perhaps you think of friendly systems that can talk to you and solve tough problems; or maniac robots that are bent on world domination? There's the promise of driverless cars that are safer than human drivers, and the worry of  medical advice systems that hold people's lives in their virtual hands. The field of Artificial Intelligence is a part of computer science that has a lot of promise and also raises a lot of concerns. It can be used to make decisions in systems as large as an aeroplane or an <a href="http://www.komatsu.com/CompanyInfo/profile/product_supports/">autonomous dump truck</a>, or as small as a mobile phone that accurately predicts text being typed into it. What they have in common is that they try to mimic aspects of human intelligence. And importantly, such systems can be of significant help in people's everyday lives.</p>
+<p>AI (also known as intelligent systems) is primarily a branch of computer science but it has borrowed a lot of concepts and ideas from other fields, especially <a href="https://en.wikipedia.org/wiki/Mathematics">mathematics</a> (particularly logic, combinatorics, statistics, probability and optimisation theory), <a href="https://en.wikipedia.org/wiki/Biology">biology</a>, <a href="https://en.wikipedia.org/wiki/Psychology">psychology</a>, <a href="https://en.wikipedia.org/wiki/Linguistics">linguistics</a>, <a href="https://en.wikipedia.org/wiki/Neuroscience">neuroscience</a> and <a href="https://en.wikipedia.org/wiki/Philosophy">philosophy</a>.</p>
diff --git a/verto/tests/assets/video/contains_vimeo_video.md b/verto/tests/assets/video/contains_vimeo_video.md
deleted file mode 100644
index c924afa6..00000000
--- a/verto/tests/assets/video/contains_vimeo_video.md
+++ /dev/null
@@ -1,5 +0,0 @@
-{image filename="context-free-tree-screenshot.png" alt="A tree drawn using the software from contextfreeart.org" source="http://contextfreeart.org/"}
-
-The *context free art* program ( [http://www.contextfreeart.org/](http://www.contextfreeart.org/) ) enables you to specify images using a context-free grammar. For example, the following pictures of trees are defined by just a few rules that are based around a forest being made of trees, a tree being made of branches, and the branches in turn being made of branches themselves! These simple definitions can create images with huge amounts of detail because the drawing process can break down the grammar into as many levels as required. You can define your own grammars to generate images, and even make a movie of them being created, like the one below. Of course, if you do this as a project make sure you understand how the system works and can explain the formal language behind your creation.
-
-{video url="http://player.vimeo.com/video/52320658"}
\ No newline at end of file
diff --git a/verto/tests/assets/video/contains_vimeo_video_expected.html b/verto/tests/assets/video/contains_vimeo_video_expected.html
deleted file mode 100644
index 9715c0a6..00000000
--- a/verto/tests/assets/video/contains_vimeo_video_expected.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<p>{image filename="context-free-tree-screenshot.png" alt="A tree drawn using the software from contextfreeart.org" source="http://contextfreeart.org/"}</p>
-<p>The <em>context free art</em> program ( <a href="http://www.contextfreeart.org/">http://www.contextfreeart.org/</a> ) enables you to specify images using a context-free grammar. For example, the following pictures of trees are defined by just a few rules that are based around a forest being made of trees, a tree being made of branches, and the branches in turn being made of branches themselves! These simple definitions can create images with huge amounts of detail because the drawing process can break down the grammar into as many levels as required. You can define your own grammars to generate images, and even make a movie of them being created, like the one below. Of course, if you do this as a project make sure you understand how the system works and can explain the formal language behind your creation.</p>
-<div class="video-container no-controls">
-<iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://player.vimeo.com/video/52320658"></iframe>
-</div>
\ No newline at end of file
diff --git a/verto/tests/assets/video/doc_example_basic_usage_expected.html b/verto/tests/assets/video/doc_example_basic_usage_expected.html
index 6c8f6a1d..0db0aa21 100644
--- a/verto/tests/assets/video/doc_example_basic_usage_expected.html
+++ b/verto/tests/assets/video/doc_example_basic_usage_expected.html
@@ -1,4 +1,3 @@
 <div>
- <iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/dQw4w9WgXcQ?rel=0">
- </iframe>
-</div>
\ No newline at end of file
+<iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/dQw4w9WgXcQ?rel=0"></iframe>
+</div>
diff --git a/verto/tests/assets/video/doc_example_override_html_expected.html b/verto/tests/assets/video/doc_example_override_html_expected.html
index 2c1850a6..32c0429b 100644
--- a/verto/tests/assets/video/doc_example_override_html_expected.html
+++ b/verto/tests/assets/video/doc_example_override_html_expected.html
@@ -1,4 +1,3 @@
 <div>
- <iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/Uw0PISu2pog?rel=0">
- </iframe>
-</div>
\ No newline at end of file
+<iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/Uw0PISu2pog?rel=0"></iframe>
+</div>
diff --git a/verto/tests/assets/video/doc_example_override_html_template.html b/verto/tests/assets/video/doc_example_override_html_template.html
index 833b9cb0..0014b773 100644
--- a/verto/tests/assets/video/doc_example_override_html_template.html
+++ b/verto/tests/assets/video/doc_example_override_html_template.html
@@ -1,4 +1,3 @@
 <div>
-  <iframe allowfullscreen="allowfullscreen" frameborder="0" src="{{ video_url }}">
-  </iframe>
-</div>
\ No newline at end of file
+<iframe allowfullscreen="allowfullscreen" frameborder="0" src="{{ video_url }}"></iframe>
+</div>
diff --git a/verto/tests/assets/video/multiple_vimeo_links_expected.html b/verto/tests/assets/video/multiple_vimeo_links_expected.html
index c9eef5c9..2470207d 100644
--- a/verto/tests/assets/video/multiple_vimeo_links_expected.html
+++ b/verto/tests/assets/video/multiple_vimeo_links_expected.html
@@ -1,12 +1,9 @@
 <div>
- <iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://player.vimeo.com/video/52320658">
- </iframe>
+<iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://player.vimeo.com/video/52320658"></iframe>
 </div>
 <div>
- <iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://player.vimeo.com/video/94502406">
- </iframe>
+<iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://player.vimeo.com/video/94502406"></iframe>
 </div>
 <div>
- <iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://player.vimeo.com/video/94502406">
- </iframe>
-</div>
\ No newline at end of file
+<iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://player.vimeo.com/video/94502406"></iframe>
+</div>
diff --git a/verto/tests/assets/video/multiple_youtube_links_expected.html b/verto/tests/assets/video/multiple_youtube_links_expected.html
index bf051ae8..2d452568 100644
--- a/verto/tests/assets/video/multiple_youtube_links_expected.html
+++ b/verto/tests/assets/video/multiple_youtube_links_expected.html
@@ -1,38 +1,21 @@
-<h3>
- Videos
-</h3>
-<p>
- There and back again: a packet's tale
-</p>
+<h3>Videos</h3>
+<p>There and back again: a packet's tale</p>
 <div>
- <iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/WwyJGzZmBe8?rel=0">
- </iframe>
+<iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/WwyJGzZmBe8?rel=0"></iframe>
 </div>
-<p>
- How does the internet work?
-</p>
+<p>How does the internet work?</p>
 <div>
- <iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/i5oe63pOhLI?rel=0">
- </iframe>
+<iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/i5oe63pOhLI?rel=0"></iframe>
 </div>
-<p>
- Totally real video
-</p>
+<p>Totally real video</p>
 <div>
- <iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/totallyrealvideo?rel=0">
- </iframe>
+<iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/totallyrealvideo?rel=0"></iframe>
 </div>
-<p>
- How the internet works in 5 minutes
-</p>
+<p>How the internet works in 5 minutes</p>
 <div>
- <iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/7_LPdttKXPc?rel=0">
- </iframe>
+<iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/7_LPdttKXPc?rel=0"></iframe>
 </div>
-<p>
- It has English captions, but the most interesting part is what is happening in the action.
-</p>
+<p>It has English captions, but the most interesting part is what is happening in the action.</p>
 <div>
- <iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/_fNp37zFn9Q?rel=0">
- </iframe>
-</div>
\ No newline at end of file
+<iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/_fNp37zFn9Q?rel=0"></iframe>
+</div>
diff --git a/verto/tests/assets/video/vimeo_link.md b/verto/tests/assets/video/vimeo_link.md
index 44c47545..7707cfb6 100644
--- a/verto/tests/assets/video/vimeo_link.md
+++ b/verto/tests/assets/video/vimeo_link.md
@@ -1,6 +1,6 @@
 {image filename="context-free-tree-screenshot.png" alt="A tree drawn using the software from contextfreeart.org" source="http://contextfreeart.org/"}
 
-The *context free art* program ( [http://www.contextfreeart.org/](http://www.contextfreeart.org/) ) enables you to specify images using a context-free grammar. For example, the following pictures of trees are defined by just a few rules that are based around a forest being made of trees, a tree being made of branches, and the branches in turn being made of branches themselves! These simple definitions can create images with huge amounts of detail because the drawing process can break down the grammar into as many levels as required. You can define your own grammars to generate images, and even make a movie of them being created, like the one below. Of course, if you do this as a project make sure you understand how the system works and can explain the formal language behind your creation.
+The *context free art* program ([http://www.contextfreeart.org/](http://www.contextfreeart.org/)) enables you to specify images using a context-free grammar. For example, the following pictures of trees are defined by just a few rules that are based around a forest being made of trees, a tree being made of branches, and the branches in turn being made of branches themselves! These simple definitions can create images with huge amounts of detail because the drawing process can break down the grammar into as many levels as required. You can define your own grammars to generate images, and even make a movie of them being created, like the one below. Of course, if you do this as a project make sure you understand how the system works and can explain the formal language behind your creation.
 
 {video url="https://vimeo.com/94502406"}
 
@@ -8,4 +8,4 @@ The *context free art* program ( [http://www.contextfreeart.org/](http://www.con
 
 .. TCB the above context-free-tree video was generated from the context-free program --- you can control the frame rate etc. if a different version is needed. It is just "demo1" in the program. Music is from a song by Andrew Bell
 
-{comment end}
\ No newline at end of file
+{comment end}
diff --git a/verto/tests/assets/video/vimeo_link_expected.html b/verto/tests/assets/video/vimeo_link_expected.html
index cf7ba917..e471e25b 100644
--- a/verto/tests/assets/video/vimeo_link_expected.html
+++ b/verto/tests/assets/video/vimeo_link_expected.html
@@ -1,27 +1,8 @@
-<p>
- {image filename="context-free-tree-screenshot.png" alt="A tree drawn using the software from contextfreeart.org" source="http://contextfreeart.org/"}
-</p>
-<p>
- The
- <em>
-  context free art
- </em>
- program (
- <a href="http://www.contextfreeart.org/">
-  http://www.contextfreeart.org/
- </a>
- ) enables you to specify images using a context-free grammar. For example, the following pictures of trees are defined by just a few rules that are based around a forest being made of trees, a tree being made of branches, and the branches in turn being made of branches themselves! These simple definitions can create images with huge amounts of detail because the drawing process can break down the grammar into as many levels as required. You can define your own grammars to generate images, and even make a movie of them being created, like the one below. Of course, if you do this as a project make sure you understand how the system works and can explain the formal language behind your creation.
-</p>
+<p>{image filename="context-free-tree-screenshot.png" alt="A tree drawn using the software from contextfreeart.org" source="http://contextfreeart.org/"}</p>
+<p>The <em>context free art</em> program (<a href="http://www.contextfreeart.org/">http://www.contextfreeart.org/</a>) enables you to specify images using a context-free grammar. For example, the following pictures of trees are defined by just a few rules that are based around a forest being made of trees, a tree being made of branches, and the branches in turn being made of branches themselves! These simple definitions can create images with huge amounts of detail because the drawing process can break down the grammar into as many levels as required. You can define your own grammars to generate images, and even make a movie of them being created, like the one below. Of course, if you do this as a project make sure you understand how the system works and can explain the formal language behind your creation.</p>
 <div>
- <iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://player.vimeo.com/video/94502406">
- </iframe>
+<iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://player.vimeo.com/video/94502406"></iframe>
 </div>
-<p>
- {comment}
-</p>
-<p>
- .. TCB the above context-free-tree video was generated from the context-free program --- you can control the frame rate etc. if a different version is needed. It is just "demo1" in the program. Music is from a song by Andrew Bell
-</p>
-<p>
- {comment end}
-</p>
\ No newline at end of file
+<p>{comment}</p>
+<p>.. TCB the above context-free-tree video was generated from the context-free program --- you can control the frame rate etc. if a different version is needed. It is just "demo1" in the program. Music is from a song by Andrew Bell</p>
+<p>{comment end}</p>
diff --git a/verto/tests/assets/video/vimeo_player_link.md b/verto/tests/assets/video/vimeo_player_link.md
index 9c0dcd44..832603b4 100644
--- a/verto/tests/assets/video/vimeo_player_link.md
+++ b/verto/tests/assets/video/vimeo_player_link.md
@@ -1,6 +1,6 @@
 {image filename="context-free-tree-screenshot.png" alt="A tree drawn using the software from contextfreeart.org" source="http://contextfreeart.org/"}
 
-The *context free art* program ( [http://www.contextfreeart.org/](http://www.contextfreeart.org/) ) enables you to specify images using a context-free grammar. For example, the following pictures of trees are defined by just a few rules that are based around a forest being made of trees, a tree being made of branches, and the branches in turn being made of branches themselves! These simple definitions can create images with huge amounts of detail because the drawing process can break down the grammar into as many levels as required. You can define your own grammars to generate images, and even make a movie of them being created, like the one below. Of course, if you do this as a project make sure you understand how the system works and can explain the formal language behind your creation.
+The *context free art* program ([http://www.contextfreeart.org/](http://www.contextfreeart.org/)) enables you to specify images using a context-free grammar. For example, the following pictures of trees are defined by just a few rules that are based around a forest being made of trees, a tree being made of branches, and the branches in turn being made of branches themselves! These simple definitions can create images with huge amounts of detail because the drawing process can break down the grammar into as many levels as required. You can define your own grammars to generate images, and even make a movie of them being created, like the one below. Of course, if you do this as a project make sure you understand how the system works and can explain the formal language behind your creation.
 
 {video url="http://player.vimeo.com/video/52320658"}
 
@@ -8,4 +8,4 @@ The *context free art* program ( [http://www.contextfreeart.org/](http://www.con
 
 .. TCB the above context-free-tree video was generated from the context-free program --- you can control the frame rate etc. if a different version is needed. It is just "demo1" in the program. Music is from a song by Andrew Bell
 
-{comment end}
\ No newline at end of file
+{comment end}
diff --git a/verto/tests/assets/video/vimeo_player_link_expected.html b/verto/tests/assets/video/vimeo_player_link_expected.html
index 3f730e86..a86573e2 100644
--- a/verto/tests/assets/video/vimeo_player_link_expected.html
+++ b/verto/tests/assets/video/vimeo_player_link_expected.html
@@ -1,27 +1,8 @@
-<p>
- {image filename="context-free-tree-screenshot.png" alt="A tree drawn using the software from contextfreeart.org" source="http://contextfreeart.org/"}
-</p>
-<p>
- The
- <em>
-  context free art
- </em>
- program (
- <a href="http://www.contextfreeart.org/">
-  http://www.contextfreeart.org/
- </a>
- ) enables you to specify images using a context-free grammar. For example, the following pictures of trees are defined by just a few rules that are based around a forest being made of trees, a tree being made of branches, and the branches in turn being made of branches themselves! These simple definitions can create images with huge amounts of detail because the drawing process can break down the grammar into as many levels as required. You can define your own grammars to generate images, and even make a movie of them being created, like the one below. Of course, if you do this as a project make sure you understand how the system works and can explain the formal language behind your creation.
-</p>
+<p>{image filename="context-free-tree-screenshot.png" alt="A tree drawn using the software from contextfreeart.org" source="http://contextfreeart.org/"}</p>
+<p>The <em>context free art</em> program (<a href="http://www.contextfreeart.org/">http://www.contextfreeart.org/</a>) enables you to specify images using a context-free grammar. For example, the following pictures of trees are defined by just a few rules that are based around a forest being made of trees, a tree being made of branches, and the branches in turn being made of branches themselves! These simple definitions can create images with huge amounts of detail because the drawing process can break down the grammar into as many levels as required. You can define your own grammars to generate images, and even make a movie of them being created, like the one below. Of course, if you do this as a project make sure you understand how the system works and can explain the formal language behind your creation.</p>
 <div>
- <iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://player.vimeo.com/video/52320658">
- </iframe>
+<iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://player.vimeo.com/video/52320658"></iframe>
 </div>
-<p>
- {comment}
-</p>
-<p>
- .. TCB the above context-free-tree video was generated from the context-free program --- you can control the frame rate etc. if a different version is needed. It is just "demo1" in the program. Music is from a song by Andrew Bell
-</p>
-<p>
- {comment end}
-</p>
\ No newline at end of file
+<p>{comment}</p>
+<p>.. TCB the above context-free-tree video was generated from the context-free program --- you can control the frame rate etc. if a different version is needed. It is just "demo1" in the program. Music is from a song by Andrew Bell</p>
+<p>{comment end}</p>
diff --git a/verto/tests/assets/video/youtube_and_vimeo_links_expected.html b/verto/tests/assets/video/youtube_and_vimeo_links_expected.html
index 42a96b32..708705db 100644
--- a/verto/tests/assets/video/youtube_and_vimeo_links_expected.html
+++ b/verto/tests/assets/video/youtube_and_vimeo_links_expected.html
@@ -1,50 +1,30 @@
-<h3>
- Videos
-</h3>
-<p>
- There and back again: a packet's tale
-</p>
+<h3>Videos</h3>
+<p>There and back again: a packet's tale</p>
 <div>
- <iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/WwyJGzZmBe8?rel=0">
- </iframe>
+<iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/WwyJGzZmBe8?rel=0"></iframe>
 </div>
 <div>
- <iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://player.vimeo.com/video/52320658">
- </iframe>
+<iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://player.vimeo.com/video/52320658"></iframe>
 </div>
-<p>
- How does the internet work?
-</p>
+<p>How does the internet work?</p>
 <div>
- <iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/i5oe63pOhLI?rel=0">
- </iframe>
+<iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/i5oe63pOhLI?rel=0"></iframe>
 </div>
-<p>
- Totally real video
-</p>
+<p>Totally real video</p>
 <div>
- <iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/totallyrealvideo?rel=0">
- </iframe>
+<iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/totallyrealvideo?rel=0"></iframe>
 </div>
-<p>
- How the internet works in 5 minutes
-</p>
+<p>How the internet works in 5 minutes</p>
 <div>
- <iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/7_LPdttKXPc?rel=0">
- </iframe>
+<iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/7_LPdttKXPc?rel=0"></iframe>
 </div>
 <div>
- <iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://player.vimeo.com/video/94502406">
- </iframe>
+<iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://player.vimeo.com/video/94502406"></iframe>
 </div>
-<p>
- It has English captions, but the most interesting part is what is happening in the action.
-</p>
+<p>It has English captions, but the most interesting part is what is happening in the action.</p>
 <div>
- <iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/_fNp37zFn9Q?rel=0">
- </iframe>
+<iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/_fNp37zFn9Q?rel=0"></iframe>
 </div>
 <div>
- <iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://player.vimeo.com/video/94502406">
- </iframe>
-</div>
\ No newline at end of file
+<iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://player.vimeo.com/video/94502406"></iframe>
+</div>
diff --git a/verto/tests/assets/video/youtube_be_link_expected.html b/verto/tests/assets/video/youtube_be_link_expected.html
index b49497a5..48a1c01b 100644
--- a/verto/tests/assets/video/youtube_be_link_expected.html
+++ b/verto/tests/assets/video/youtube_be_link_expected.html
@@ -1,10 +1,5 @@
-<p>
- Engineering Disasters 13: Software Flaws
-</p>
+<p>Engineering Disasters 13: Software Flaws</p>
 <div>
- <iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/EMVBLg2MrLs?rel=0">
- </iframe>
+<iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/EMVBLg2MrLs?rel=0"></iframe>
 </div>
-<p>
- is an excerpt from Engineering Disaster Episode 13 explaining software flaws in Ariane 5 and Patriot Missiles
-</p>
\ No newline at end of file
+<p>is an excerpt from Engineering Disaster Episode 13 explaining software flaws in Ariane 5 and Patriot Missiles</p>
diff --git a/verto/tests/assets/video/youtube_embed_link_expected.html b/verto/tests/assets/video/youtube_embed_link_expected.html
index 8a4202e2..151447a8 100644
--- a/verto/tests/assets/video/youtube_embed_link_expected.html
+++ b/verto/tests/assets/video/youtube_embed_link_expected.html
@@ -1,31 +1,13 @@
-<h2>
- Run Length Encoding
-</h2>
+<h2>Run Length Encoding</h2>
 <div>
- <iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/uaV2RuAJTjQ?rel=0">
- </iframe>
+<iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/uaV2RuAJTjQ?rel=0"></iframe>
 </div>
-<p>
- Run length encoding (RLE) is a technique that isn't so widely used these days, but it's a great way to get a feel for some of the issues around using compression.
-</p>
-<p>
- {panel type="teacher-note" summary="Who uses run length encoding?"}
-</p>
-<p>
- <a href="https://en.wikipedia.org/wiki/Run-length_encoding">
-  Run-length_encoding
- </a>
- was widely used when black and white images were the norm.
+<p>Run length encoding (RLE) is a technique that isn't so widely used these days, but it's a great way to get a feel for some of the issues around using compression.</p>
+<p>{panel type="teacher-note" summary="Who uses run length encoding?"}</p>
+<p><a href="https://en.wikipedia.org/wiki/Run-length_encoding">Run-length_encoding</a> was widely used when black and white images were the norm.
 One of its key roles was as the compression method that made Fax (facsimile) machines possible in a standard that was adopted in 1980.
 The pixels in a fax image are only black or white, and typically there are long runs of white pixels in the margins, so RLE is particularly effective.
-Also, the method is very simple, and in the 1980s this was important since it reduced the cost of the electronics inside the machine.
-</p>
-<p>
- Run length encoding is still used as part of JPEG compression, although not to code runs of pixels (in a photo it's unusual to have runs of exactly the same colour).
-</p>
-<p>
- We have introduced RLE here because it is a practical approach to compression, and most importantly it shows the key benefits and problems that arise in compression.
-</p>
-<p>
- {panel end}
-</p>
+Also, the method is very simple, and in the 1980s this was important since it reduced the cost of the electronics inside the machine.</p>
+<p>Run length encoding is still used as part of JPEG compression, although not to code runs of pixels (in a photo it's unusual to have runs of exactly the same colour).</p>
+<p>We have introduced RLE here because it is a practical approach to compression, and most importantly it shows the key benefits and problems that arise in compression.</p>
+<p>{panel end}</p>
diff --git a/verto/tests/assets/video/youtube_watch_link_expected.html b/verto/tests/assets/video/youtube_watch_link_expected.html
index 38782968..77b23ec3 100644
--- a/verto/tests/assets/video/youtube_watch_link_expected.html
+++ b/verto/tests/assets/video/youtube_watch_link_expected.html
@@ -1,34 +1,9 @@
-<p>
- There are even more chatterbots you can talk to. Try looking at the
- <a href="https://en.wikipedia.org/wiki/List_of_chatterbots">
-  list on wikipedia
- </a>
- , or doing a google search for chatterbots. Each chatterbot on this list has its own wikipedia page. You should be able to find the chatterbots by either an internet search, or looking at the references of the wikipedia pages. Some of these will have rules that were determined by programmers, and others will have rules that were learnt from humans.
-</p>
-<p>
- If you have a device that runs Apple iOS (for example an iPhone), have a look at the
- <a href="https://en.wikipedia.org/wiki/Siri_%28software%29">
-  Siri
- </a>
- chatterbot in the device&rsquo;s help system. Siri is an example of a chatterbot that has the job of
- <em>
-  helping
- </em>
- a human, unlike most chatterbots which simply have the purpose of web entertainment.  It also has voice recognition, so you can talk to it rather than just typing to it.
-</p>
-<h3>
- The Turing Test
-</h3>
-<p>
- {panel type="teacher-note" summary="TED video introducing the Turing Test"}
-</p>
-<p>
- There is a TED video that gives an overview of the Turing Test on YouTube
-</p>
+<p>There are even more chatterbots you can talk to. Try looking at the <a href="https://en.wikipedia.org/wiki/List_of_chatterbots">list on wikipedia</a>, or doing a google search for chatterbots. Each chatterbot on this list has its own wikipedia page. You should be able to find the chatterbots by either an internet search, or looking at the references of the wikipedia pages. Some of these will have rules that were determined by programmers, and others will have rules that were learnt from humans.</p>
+<p>If you have a device that runs Apple iOS (for example an iPhone), have a look at the <a href="https://en.wikipedia.org/wiki/Siri_%28software%29">Siri</a> chatterbot in the device’s help system. Siri is an example of a chatterbot that has the job of <em>helping</em> a human, unlike most chatterbots which simply have the purpose of web entertainment.  It also has voice recognition, so you can talk to it rather than just typing to it.</p>
+<h3>The Turing Test</h3>
+<p>{panel type="teacher-note" summary="TED video introducing the Turing Test"}</p>
+<p>There is a TED video that gives an overview of the Turing Test on YouTube</p>
 <div>
- <iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/3wLqsRLvV-c?rel=0">
- </iframe>
+<iframe allowfullscreen="allowfullscreen" frameborder="0" src="https://www.youtube.com/embed/3wLqsRLvV-c?rel=0"></iframe>
 </div>
-<p>
- {panel end}
-</p>
+<p>{panel end}</p>
diff --git a/verto/tests/start_tests.py b/verto/tests/start_tests.py
index 8d5fd23c..b1743e2a 100644
--- a/verto/tests/start_tests.py
+++ b/verto/tests/start_tests.py
@@ -4,7 +4,6 @@
 from verto.tests.ConfigurationTest import ConfigurationTest
 from verto.tests.SmokeTests import SmokeFileTest, SmokeDocsTest
 
-from verto.tests.BeautifyTest import BeautifyTest
 from verto.tests.BoxedTextTest import BoxedTextTest
 from verto.tests.ButtonLinkTest import ButtonLinkTest
 from verto.tests.CommentTest import CommentTest
@@ -65,7 +64,7 @@ def unit_suite():
     '''Builds unittests. (Not really unittests).
     '''
     return unittest.TestSuite((
-        unittest.makeSuite(BeautifyTest),
+        # unittest.makeSuite(BeautifyTest),
         unittest.makeSuite(BoxedTextTest),
         unittest.makeSuite(ButtonLinkTest),
         unittest.makeSuite(CommentTest),

From 2196eb1aa5f2d6912466f3d37a055f8201e2c6ca Mon Sep 17 00:00:00 2001
From: Hayden Jackson <hayden.adam.jackson@gmail.com>
Date: Fri, 5 May 2017 18:56:25 +1200
Subject: [PATCH 08/11] Remove final remaining references.

---
 docs/source/processors/index.rst | 1 -
 verto/tests/JinjaTest.py         | 3 +--
 verto/tests/RemoveTest.py        | 3 +--
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/docs/source/processors/index.rst b/docs/source/processors/index.rst
index a43850fd..9a4ace0a 100644
--- a/docs/source/processors/index.rst
+++ b/docs/source/processors/index.rst
@@ -38,7 +38,6 @@ The following pages cover processors that do not require explicit use when autho
 .. toctree::
     :maxdepth: 1
 
-    beautify
     jinja
     orderedlist
     remove
diff --git a/verto/tests/JinjaTest.py b/verto/tests/JinjaTest.py
index 79482658..effce2e2 100644
--- a/verto/tests/JinjaTest.py
+++ b/verto/tests/JinjaTest.py
@@ -3,8 +3,7 @@
 from verto.tests.ProcessorTest import ProcessorTest
 
 class JinjaTest(ProcessorTest):
-    '''The major concern with beautifying is that preformatted tags and
-    code blocks are unchanged. The tests here cover these cases.
+    '''Unescape special characters within Django blocks.
     '''
 
     def __init__(self, *args, **kwargs):
diff --git a/verto/tests/RemoveTest.py b/verto/tests/RemoveTest.py
index a91cdead..96f405bc 100644
--- a/verto/tests/RemoveTest.py
+++ b/verto/tests/RemoveTest.py
@@ -3,8 +3,7 @@
 from verto.tests.ProcessorTest import ProcessorTest
 
 class RemoveTest(ProcessorTest):
-    '''The major concern with beautifying is that preformatted tags and
-    code blocks are unchanged. The tests here cover these cases.
+    '''Removes tags <remove> and </remove> from the document.
     '''
 
     def __init__(self, *args, **kwargs):

From 18b3456abcf6476aa9466d291fb5af7df8f482b7 Mon Sep 17 00:00:00 2001
From: Hayden Jackson <hayden.adam.jackson@gmail.com>
Date: Fri, 5 May 2017 19:39:09 +1200
Subject: [PATCH 09/11] Remove BeautifyTest references.

---
 verto/tests/start_tests.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/verto/tests/start_tests.py b/verto/tests/start_tests.py
index b1743e2a..069dd019 100644
--- a/verto/tests/start_tests.py
+++ b/verto/tests/start_tests.py
@@ -64,7 +64,6 @@ def unit_suite():
     '''Builds unittests. (Not really unittests).
     '''
     return unittest.TestSuite((
-        # unittest.makeSuite(BeautifyTest),
         unittest.makeSuite(BoxedTextTest),
         unittest.makeSuite(ButtonLinkTest),
         unittest.makeSuite(CommentTest),

From 6eb69b29c8bca948dedccaa925a4a1c968647596 Mon Sep 17 00:00:00 2001
From: Hayden Jackson <hayden.adam.jackson@gmail.com>
Date: Sat, 6 May 2017 16:42:02 +1200
Subject: [PATCH 10/11] Added tests to ensure data is cleared correctly or kept
 between runs.

---
 verto/VertoExtension.py                       |  8 +-
 verto/processors/HeadingBlockProcessor.py     |  2 +-
 verto/tests/ConfigurationTest.py              | 95 ++++++++++++++++++-
 verto/tests/assets/configuration/otherfile.md | 11 +++
 .../configuration/otherfile_expected.html     | 11 +++
 5 files changed, 121 insertions(+), 6 deletions(-)
 create mode 100644 verto/tests/assets/configuration/otherfile.md
 create mode 100644 verto/tests/assets/configuration/otherfile_expected.html

diff --git a/verto/VertoExtension.py b/verto/VertoExtension.py
index 612d493b..5774ce66 100644
--- a/verto/VertoExtension.py
+++ b/verto/VertoExtension.py
@@ -56,15 +56,14 @@ def __init__(self, processors=[], html_templates={}, extensions=[], *args, **kwa
             extensions: A list of extra extensions for compatibility.
         '''
         super().__init__(*args, **kwargs)
-        self.required_files = defaultdict(set)
-        self.title = None
         self.jinja_templates = self.loadJinjaTemplates(html_templates)
         self.processor_info = self.loadProcessorInfo()
         self.processors = processors
+        self.title = None
+        self.heading_tree = None
         self.custom_slugify = UniqueSlugify()
         self.glossary_terms = defaultdict(list)
-        self.heading_tree = None
-
+        self.required_files = defaultdict(set)
         self.compatibility = []
         for extension in extensions:
             if isinstance(extension, utils.string_type):
@@ -125,6 +124,7 @@ def clear_saved_data(self):
         between runs on unrelated documents.
         '''
         self.custom_slugify.clear()
+        self.glossary_terms.clear()
         for key in self.required_files.keys():
             self.required_files[key].clear()
 
diff --git a/verto/processors/HeadingBlockProcessor.py b/verto/processors/HeadingBlockProcessor.py
index ddd2ef9d..72031f53 100644
--- a/verto/processors/HeadingBlockProcessor.py
+++ b/verto/processors/HeadingBlockProcessor.py
@@ -52,7 +52,6 @@ def run(self, parent, blocks):
         '''
         block = blocks.pop(0)
         match = self.pattern.search(block)
-        assert match is not None  # If this is true how did we test successfully
 
         before = block[:match.start()]
         after = block[match.end():]
@@ -91,6 +90,7 @@ def add_to_heading_tree(self, heading, heading_slug, level):
             level: the level of the heading
         '''
         if self.get_ext_tree() is None:  # We are likely on a new file
+            self.roots = []
             self.current_node = None
 
         # Who is our parent node
diff --git a/verto/tests/ConfigurationTest.py b/verto/tests/ConfigurationTest.py
index 3ed3ed74..efbc7941 100644
--- a/verto/tests/ConfigurationTest.py
+++ b/verto/tests/ConfigurationTest.py
@@ -129,8 +129,8 @@ def test_multiple_calls(self):
             )
         ]
 
+        verto = Verto()
         for filename, expected_result in test_cases:
-            verto = Verto()
             test_string = self.read_test_file(self.test_name, filename)
             verto_result = verto.convert(test_string)
 
@@ -138,6 +138,99 @@ def test_multiple_calls(self):
             self.assertEqual(verto_result.required_files, expected_result.required_files)
             self.assertTupleEqual(verto_result.heading_tree, expected_result.heading_tree)
             self.assertDictEqual(verto_result.required_glossary_terms, expected_result.required_glossary_terms)
+            verto.clear_saved_data()
+
+    def test_multiple_calls_without_clearing(self):
+        '''Tests that if the verto extension is not cleared that
+        information such as required_files and slugs are persistant.
+        '''
+        filename = 'all_processors.md'
+        other_filename = 'otherfile.md'
+        expected_result = VertoResult(
+                                html_string=self.read_test_file(self.test_name, 'all_processors_expected.html', strip=True),
+                                title='Example Title',
+                                required_files={
+                                    'interactives': {
+                                        'binary-cards'
+                                    },
+                                    'images': set(),
+                                    'page_scripts': set(),
+                                    'scratch_images': {
+                                        ScratchImageMetaData(
+                                            hash='a0f8fcad796864abfacac8bda6e0719813833fd1fca348700abbd040557c1576',
+                                            text='when flag clicked\nclear\nforever\npen down\nif <<mouse down?> and <touching [mouse-pointer v]?>> then\nswitch costume to [button v]\nelse\nadd (x position) to [list v]\nend\nmove (foo) steps\nturn ccw (9) degrees'
+                                        ),
+                                    }
+                                },
+                                heading_tree=(HeadingNode(
+                                        title='Example Title',
+                                        title_slug='example-title',
+                                        level=1,
+                                        children=(),
+                                    ),
+                                    HeadingNode(
+                                        title='Example Title 2',
+                                        title_slug='example-title-2',
+                                        level=1,
+                                        children=()
+                                    ),
+                                ),
+                                required_glossary_terms={
+                                    'algorithm': []
+                                }
+                            )
+        expected_otherfile_result = VertoResult(
+                                html_string=self.read_test_file(self.test_name, 'otherfile_expected.html', strip=True),
+                                title='Example Title',
+                                required_files={
+                                    'interactives': {
+                                        'binary-cards'
+                                    },
+                                    'images': {
+                                        'pixel-diamond.png'
+                                    },
+                                    'page_scripts': set(),
+                                    'scratch_images': {
+                                        ScratchImageMetaData(
+                                            hash='a0f8fcad796864abfacac8bda6e0719813833fd1fca348700abbd040557c1576',
+                                            text='when flag clicked\nclear\nforever\npen down\nif <<mouse down?> and <touching [mouse-pointer v]?>> then\nswitch costume to [button v]\nelse\nadd (x position) to [list v]\nend\nmove (foo) steps\nturn ccw (9) degrees'
+                                        ),
+                                        ScratchImageMetaData(
+                                            hash='b78bff524e54a18116e1e898a93e360827f874a8b0b508e1edc47d21516495ad',
+                                            text='never\ngoing\nto\ngive\nyou\nup'
+                                        ),
+                                    }
+                                },
+                                heading_tree=(HeadingNode(
+                                        title='Example Title',
+                                        title_slug='example-title-3',
+                                        level=1,
+                                        children=(),
+                                    ),
+                                ),
+                                required_glossary_terms={
+                                    'algorithm': []
+                                }
+                            )
+
+        verto = Verto()
+        # First file
+        test_string = self.read_test_file(self.test_name, filename)
+        verto_result = verto.convert(test_string)
+
+        self.assertEqual(verto_result.title, expected_result.title)
+        self.assertEqual(verto_result.required_files, expected_result.required_files)
+        self.assertTupleEqual(verto_result.heading_tree, expected_result.heading_tree)
+        self.assertDictEqual(verto_result.required_glossary_terms, expected_result.required_glossary_terms)
+
+        # Another file
+        test_string = self.read_test_file(self.test_name, other_filename)
+        verto_result = verto.convert(test_string)
+
+        self.assertEqual(verto_result.title, expected_otherfile_result.title)
+        self.assertEqual(verto_result.required_files, expected_otherfile_result.required_files)
+        self.assertTupleEqual(verto_result.heading_tree, expected_otherfile_result.heading_tree)
+        self.assertDictEqual(verto_result.required_glossary_terms, expected_otherfile_result.required_glossary_terms)
 
     def test_custom_processors_and_custom_templates_on_creation(self):
         '''Checks if custom processors and custom templates work
diff --git a/verto/tests/assets/configuration/otherfile.md b/verto/tests/assets/configuration/otherfile.md
new file mode 100644
index 00000000..b7ba1966
--- /dev/null
+++ b/verto/tests/assets/configuration/otherfile.md
@@ -0,0 +1,11 @@
+# Example Title
+
+{image file-path="pixel-diamond.png" alt="A diamond shape made out of pixels"}
+
+    scratch
+    never
+    going
+    to
+    give
+    you
+    up
diff --git a/verto/tests/assets/configuration/otherfile_expected.html b/verto/tests/assets/configuration/otherfile_expected.html
new file mode 100644
index 00000000..6b1732d5
--- /dev/null
+++ b/verto/tests/assets/configuration/otherfile_expected.html
@@ -0,0 +1,11 @@
+<h1 id="example-title">
+<span class="section_number">
+{{ chapter.number }}.
+</span>
+Example Title
+</h1>
+<div>
+<img alt="A diamond shape made out of pixels" class="" src="{% static 'pixel-diamond.png' %}" />
+</div>
+<object data="{% static 'scratch-blocks-b78bff524e54a18116e1e898a93e360827f874a8b0b508e1edc47d21516495ad.svg' %}" type="image/svg+xml">
+</object>

From 29b643d774a60eec8af36b34ee1fc31c1b44e290 Mon Sep 17 00:00:00 2001
From: Hayden Jackson <hayden.adam.jackson@gmail.com>
Date: Sat, 6 May 2017 17:04:07 +1200
Subject: [PATCH 11/11] Bump to version 0.5.3.

---
 docs/source/changelog.rst | 10 ++++++++++
 verto/__init__.py         |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
index 69a7ffa4..00384398 100644
--- a/docs/source/changelog.rst
+++ b/docs/source/changelog.rst
@@ -1,6 +1,16 @@
 Changelog
 #######################################
 
+0.5.3
+=======================================
+
+In this hotfix Verto result data for unique identifiers and required files is now only cleared when explicitly told. Result data that is per document such as title and heading tree are cleared per conversion.
+
+Fixes:
+
+  - Remove implicit Beautify processor, fixing white-spacing issues.
+  - All terms are added to glossary correctly now.
+
 0.5.2
 =======================================
 
diff --git a/verto/__init__.py b/verto/__init__.py
index 3ecbe1a2..741c4762 100644
--- a/verto/__init__.py
+++ b/verto/__init__.py
@@ -1,4 +1,4 @@
 # flake8: noqa
 from .Verto import Verto
 
-__version__ = '0.5.2'
+__version__ = '0.5.3'