diff --git a/src/Document/Object/Decorator/Page.php b/src/Document/Object/Decorator/Page.php
index b665daf3..89efba17 100644
--- a/src/Document/Object/Decorator/Page.php
+++ b/src/Document/Object/Decorator/Page.php
@@ -3,7 +3,6 @@
 namespace PrinsFrank\PdfParser\Document\Object\Decorator;
 
 use PrinsFrank\MarkDownDom\Renderer\MarkdownRenderer;
-use PrinsFrank\MarkDownDom\Renderer\TextRenderer;
 use PrinsFrank\PdfParser\Document\ContentStream\ContentStream;
 use PrinsFrank\PdfParser\Document\ContentStream\ContentStreamParser;
 use PrinsFrank\PdfParser\Document\ContentStream\PositionedText\PositionedTextElement;
@@ -16,7 +15,8 @@
 use PrinsFrank\PdfParser\Exception\InvalidArgumentException;
 use PrinsFrank\PdfParser\Exception\ParseFailureException;
 use PrinsFrank\PdfParser\Exception\PdfParserException;
-use PrinsFrank\PdfParser\Extraction\Markdown\MarkdownExtractor;
+use PrinsFrank\PdfParser\Extraction\MarkdownExtractor;
+use PrinsFrank\PdfParser\Extraction\TextExtractor;
 
 class Page extends DecoratedObject {
     /**
@@ -30,8 +30,7 @@ public function getPositionedTextElements(): array {
 
     /** @throws PdfParserException */
     public function getText(): string {
-        return (new TextRenderer())
-            ->render(MarkdownExtractor::extractContent($this->getPositionedTextElements(), $this));
+        return TextExtractor::extractContent($this->getPositionedTextElements(), $this);
     }
 
     public function getMarkdown(): string {
diff --git a/src/Extraction/Markdown/MarkdownExtractor.php b/src/Extraction/MarkdownExtractor.php
similarity index 83%
rename from src/Extraction/Markdown/MarkdownExtractor.php
rename to src/Extraction/MarkdownExtractor.php
index 98681808..69d271ef 100644
--- a/src/Extraction/Markdown/MarkdownExtractor.php
+++ b/src/Extraction/MarkdownExtractor.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace PrinsFrank\PdfParser\Extraction\Markdown;
+namespace PrinsFrank\PdfParser\Extraction;
 
 use PrinsFrank\MarkDownDom\Contract\BlockNode;
 use PrinsFrank\MarkDownDom\Contract\InlineNode;
@@ -14,7 +14,8 @@
 use PrinsFrank\PdfParser\Document\ContentStream\PositionedText\PositionedTextElement;
 use PrinsFrank\PdfParser\Document\Object\Decorator\Page;
 use PrinsFrank\PdfParser\Exception\PdfParserException;
-use PrinsFrank\PdfParser\Extraction\Markdown\TextGrouping\LineGrouping\TextOverlapStrategy;
+use PrinsFrank\PdfParser\Extraction\SpaceDetection\SpaceDetector;
+use PrinsFrank\PdfParser\Extraction\TextGrouping\LineGrouping\TextOverlapStrategy;
 
 class MarkdownExtractor {
     /**
@@ -63,23 +64,12 @@ public static function extractContent(array $positionedTextElements, Page $page)
                     self::flushInLineNodes($inLineNodes, $textBuffer, $previousElementIsBold, $previousElementIsItalic);
                 }
 
-                if ($previousTextElementOnLine !== null && $previousFontOnLine !== null) {
-                    $gap = $positionedTextElement->absoluteMatrix->offsetX
-                        - $previousTextElementOnLine->absoluteMatrix->offsetX
-                        - $previousTextElementOnLine->getAdvanceWidth($previousFontOnLine);
-
-                    $wordBreakThreshold = $previousTextElementOnLine->textState->getFontSize()
-                        * $previousTextElementOnLine->absoluteMatrix->scaleX
-                        * ($previousTextElementOnLine->textState->scale / 100)
-                        * PositionedTextElement::WORD_BREAK_THRESHOLD_EM;
-
-                    if (
-                        $gap >= $wordBreakThreshold
-                        && $previousTextElementEndsWithSpace === false
-                        && str_starts_with($elementText, ' ') === false
-                    ) {
-                        $textBuffer .= ' ';
-                    }
+                if ($previousTextElementEndsWithSpace === false
+                    && str_starts_with($elementText, ' ') === false
+                    && $previousTextElementOnLine !== null
+                    && $previousFontOnLine !== null
+                    && SpaceDetector::shouldContainExtraSpace($positionedTextElement, $previousTextElementOnLine, $previousFontOnLine)) {
+                    $textBuffer .= ' ';
                 }
 
                 $previousTextElementOnLine = $positionedTextElement;
diff --git a/src/Extraction/SpaceDetection/SpaceDetector.php b/src/Extraction/SpaceDetection/SpaceDetector.php
new file mode 100644
index 00000000..deefa4b4
--- /dev/null
+++ b/src/Extraction/SpaceDetection/SpaceDetector.php
@@ -0,0 +1,25 @@
+<?php declare(strict_types=1);
+
+namespace PrinsFrank\PdfParser\Extraction\SpaceDetection;
+
+use PrinsFrank\PdfParser\Document\ContentStream\PositionedText\PositionedTextElement;
+use PrinsFrank\PdfParser\Document\Object\Decorator\Font;
+
+class SpaceDetector {
+    public static function shouldContainExtraSpace(
+        PositionedTextElement $positionedTextElement,
+        PositionedTextElement $previousTextElementOnLine,
+        Font $previousFontOnLine,
+    ): bool {
+        $gap = $positionedTextElement->absoluteMatrix->offsetX
+            - $previousTextElementOnLine->absoluteMatrix->offsetX
+            - $previousTextElementOnLine->getAdvanceWidth($previousFontOnLine);
+
+        $wordBreakThreshold = $previousTextElementOnLine->textState->getFontSize()
+            * $previousTextElementOnLine->absoluteMatrix->scaleX
+            * ($previousTextElementOnLine->textState->scale / 100)
+            * PositionedTextElement::WORD_BREAK_THRESHOLD_EM;
+
+        return $gap >= $wordBreakThreshold;
+    }
+}
diff --git a/src/Extraction/TextExtractor.php b/src/Extraction/TextExtractor.php
new file mode 100644
index 00000000..1ddba7ec
--- /dev/null
+++ b/src/Extraction/TextExtractor.php
@@ -0,0 +1,54 @@
+<?php declare(strict_types=1);
+
+namespace PrinsFrank\PdfParser\Extraction;
+
+use PrinsFrank\PdfParser\Document\ContentStream\PositionedText\PositionedTextElement;
+use PrinsFrank\PdfParser\Document\Object\Decorator\Page;
+use PrinsFrank\PdfParser\Exception\PdfParserException;
+use PrinsFrank\PdfParser\Extraction\SpaceDetection\SpaceDetector;
+use PrinsFrank\PdfParser\Extraction\TextGrouping\LineGrouping\TextOverlapStrategy;
+
+class TextExtractor {
+    /**
+     * @param list<PositionedTextElement> $positionedTextElements
+     * @throws PdfParserException
+     */
+    public static function extractContent(array $positionedTextElements, Page $page): string {
+        $lineGroupedElements = TextOverlapStrategy::group($positionedTextElements);
+
+        $textBuffer = '';
+        foreach ($lineGroupedElements as $i => $positionedTextElementsForLine) {
+            if ($i !== 0) {
+                $textBuffer .= "\n";
+            }
+
+            $previousTextElementOnLine = null;
+            $previousFontOnLine = null;
+            $previousTextElementEndsWithSpace = false;
+            foreach ($positionedTextElementsForLine as $positionedTextElement) {
+                $elementText = $positionedTextElement->getText($page);
+                $font = $positionedTextElement->getFont($page);
+                if ($elementText === '') {
+                    $previousTextElementOnLine = $positionedTextElement;
+                    $previousFontOnLine = $font;
+                    continue;
+                }
+
+                if ($previousTextElementEndsWithSpace === false
+                    && str_starts_with($elementText, ' ') === false
+                    && $previousTextElementOnLine !== null
+                    && $previousFontOnLine !== null
+                    && SpaceDetector::shouldContainExtraSpace($positionedTextElement, $previousTextElementOnLine, $previousFontOnLine)) {
+                    $textBuffer .= ' ';
+                }
+
+                $previousTextElementOnLine = $positionedTextElement;
+                $previousFontOnLine = $font;
+                $previousTextElementEndsWithSpace = str_ends_with($elementText, ' ');
+                $textBuffer .= $elementText;
+            }
+        }
+
+        return $textBuffer;
+    }
+}
diff --git a/src/Extraction/Markdown/TextGrouping/LineGrouping/TextOverlapStrategy.php b/src/Extraction/TextGrouping/LineGrouping/TextOverlapStrategy.php
similarity index 98%
rename from src/Extraction/Markdown/TextGrouping/LineGrouping/TextOverlapStrategy.php
rename to src/Extraction/TextGrouping/LineGrouping/TextOverlapStrategy.php
index 41c5adf3..c48d58e4 100644
--- a/src/Extraction/Markdown/TextGrouping/LineGrouping/TextOverlapStrategy.php
+++ b/src/Extraction/TextGrouping/LineGrouping/TextOverlapStrategy.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace PrinsFrank\PdfParser\Extraction\Markdown\TextGrouping\LineGrouping;
+namespace PrinsFrank\PdfParser\Extraction\TextGrouping\LineGrouping;
 
 use PrinsFrank\PdfParser\Document\ContentStream\PositionedText\PositionedTextElement;
 
diff --git a/tests/Samples/files/issue-215/contents.yml b/tests/Samples/files/issue-215/contents.yml
index caae09a1..e473e38b 100644
--- a/tests/Samples/files/issue-215/contents.yml
+++ b/tests/Samples/files/issue-215/contents.yml
@@ -14,8 +14,7 @@ modificationDate: 2025-09-01T16:24:09+02:00
 pages:
   -
     text: |-
-      Deutscher Bundestag
-       Drucksache 21/1407
+      Deutscher Bundestag Drucksache 21/1407
       21. Wahlperiode 28.08.2025
       Antwort 
       der Bundesregierung 
diff --git a/tests/Samples/files/issue-235/contents.yml b/tests/Samples/files/issue-235/contents.yml
index 2d28eced..a3bbacee 100644
--- a/tests/Samples/files/issue-235/contents.yml
+++ b/tests/Samples/files/issue-235/contents.yml
@@ -15,10 +15,8 @@ pages:
   -
     text: |-
        
-      Niedersächsisches
-       
-      Gesetz- und Verordnungsblatt
-       
+      Niedersächsisches 
+      Gesetz- und Verordnungsblatt 
       79. Jahrgang Hannover, den 10. April 2025 Nummer 25 
        
       Verordnung 
diff --git a/tests/Samples/files/issue-290/contents.yml b/tests/Samples/files/issue-290/contents.yml
index b9e3acee..6a3e5dc4 100644
--- a/tests/Samples/files/issue-290/contents.yml
+++ b/tests/Samples/files/issue-290/contents.yml
@@ -14,8 +14,7 @@ modificationDate: 2025-09-12T14:25:52+02:00
 pages:
   -
     text: |-
-      Deutscher Bundestag
-       Drucksache 21/1576
+      Deutscher Bundestag Drucksache 21/1576
       21. Wahlperiode 10.09.2025
       Antwort 
       der Bundesregierung 
diff --git a/tests/Samples/files/libreoffice-different-fonts-sizes/contents.yml b/tests/Samples/files/libreoffice-different-fonts-sizes/contents.yml
index 5d5858e4..05f60a0e 100644
--- a/tests/Samples/files/libreoffice-different-fonts-sizes/contents.yml
+++ b/tests/Samples/files/libreoffice-different-fonts-sizes/contents.yml
@@ -13,7 +13,7 @@ creationDate: 2025-12-02T18:58:35+01:00
 modificationDate: null
 pages:
   -
-    text: |
+    text: |-
       Etiam vitae lectus sodales
       Vestibulum et augue vitae orci sagittis faucibus
       Donec risus risus
diff --git a/tests/Samples/files/text-objects-across-multiple-streams/contents.yml b/tests/Samples/files/text-objects-across-multiple-streams/contents.yml
index 875ee98e..f2681405 100644
--- a/tests/Samples/files/text-objects-across-multiple-streams/contents.yml
+++ b/tests/Samples/files/text-objects-across-multiple-streams/contents.yml
@@ -298,8 +298,7 @@ pages:
       RS-422
       Control Panel output
       will contend with 7707DT
-      Incorrect Method
-       output. Will not work.
+      Incorrect Method output. Will not work.
       7707DT
       Set to
       RS-422
diff --git a/tests/Samples/files/type1-differences-non-ascii/contents.yml b/tests/Samples/files/type1-differences-non-ascii/contents.yml
index 3f7fc21b..fda49e6f 100644
--- a/tests/Samples/files/type1-differences-non-ascii/contents.yml
+++ b/tests/Samples/files/type1-differences-non-ascii/contents.yml
@@ -13,7 +13,6 @@ creationDate: null
 modificationDate: null
 pages:
   -
-    text: |
-      Für Größe Übung
+    text: 'Für Größe Übung'
     markdown: |+
       ### Für Größe Übung
diff --git a/tests/Unit/Document/ContentStream/PositionedText/LineGroupingStrategy/TextOverlapStrategyTest.php b/tests/Unit/Document/ContentStream/PositionedText/LineGroupingStrategy/TextOverlapStrategyTest.php
index 16acbdbf..346a0c94 100644
--- a/tests/Unit/Document/ContentStream/PositionedText/LineGroupingStrategy/TextOverlapStrategyTest.php
+++ b/tests/Unit/Document/ContentStream/PositionedText/LineGroupingStrategy/TextOverlapStrategyTest.php
@@ -9,7 +9,7 @@
 use PrinsFrank\PdfParser\Document\ContentStream\PositionedText\TextState;
 use PrinsFrank\PdfParser\Document\ContentStream\PositionedText\TransformationMatrix;
 use PrinsFrank\PdfParser\Document\Dictionary\DictionaryValue\TextString\LiteralStringValue;
-use PrinsFrank\PdfParser\Extraction\Markdown\TextGrouping\LineGrouping\TextOverlapStrategy;
+use PrinsFrank\PdfParser\Extraction\TextGrouping\LineGrouping\TextOverlapStrategy;
 
 #[CoversClass(TextOverlapStrategy::class)]
 class TextOverlapStrategyTest extends TestCase {
diff --git a/tests/Unit/PdfParserTest.php b/tests/Unit/PdfParserTest.php
index 11be9c5d..18372e16 100644
--- a/tests/Unit/PdfParserTest.php
+++ b/tests/Unit/PdfParserTest.php
@@ -12,7 +12,7 @@ class PdfParserTest extends TestCase {
     public function testParseStringInMemory(): void {
         static::assertNotFalse($fileContent = file_get_contents(dirname(__DIR__) . '/Feature/samples/h3-simple-string.pdf'));
         static::assertSame(
-            ' Hello World ' . PHP_EOL,
+            ' Hello World ',
             (new PdfParser())
                 ->parseString(
                     $fileContent,
@@ -23,7 +23,7 @@ public function testParseStringInMemory(): void {
     public function testParseStringWithFileCache(): void {
         static::assertNotFalse($fileContent = file_get_contents(dirname(__DIR__) . '/Feature/samples/h3-simple-string.pdf'));
         static::assertSame(
-            ' Hello World ' . PHP_EOL,
+            ' Hello World ',
             (new PdfParser())
                 ->parseString(
                     $fileContent,
@@ -34,7 +34,7 @@ public function testParseStringWithFileCache(): void {
 
     public function testParseFileInMemory(): void {
         static::assertSame(
-            ' Hello World ' . PHP_EOL,
+            ' Hello World ',
             (new PdfParser())
                 ->parseFile(
                     dirname(__DIR__) . '/Feature/samples/h3-simple-string.pdf',
@@ -45,7 +45,7 @@ public function testParseFileInMemory(): void {
 
     public function testParseFileWithoutMemoryStream(): void {
         static::assertSame(
-            ' Hello World ' . PHP_EOL,
+            ' Hello World ',
             (new PdfParser())
                 ->parseFile(
                     dirname(__DIR__) . '/Feature/samples/h3-simple-string.pdf',