diff --git a/action.php b/action.php
index b33f240..fd76bd5 100644
--- a/action.php
+++ b/action.php
@@ -435,11 +435,11 @@ protected function showDiscussionSection($reply = null, $edit = null)
             $show = true;
             // section title
             $title = (!empty($data['title']) ? hsc($data['title']) : $this->getLang('discussion'));
-            ptln('<div class="comment_wrapper" id="comment_wrapper">'); // the id value is used for visibility toggling the section
-            ptln('<h2><a name="discussion__section" id="discussion__section">', 2);
-            ptln($title, 4);
-            ptln('</a></h2>', 2);
-            ptln('<div class="level2 hfeed">', 2);
+            echo('<div class="comment_wrapper" id="comment_wrapper">'); // the id value is used for visibility toggling the section
+            echo('  <h2><a name="discussion__section" id="discussion__section">');
+            echo('    '.$title);
+            echo('  </a></h2>');
+            echo('  <div class="level2 hfeed">');
         }
 
         // now display the comments
@@ -466,8 +466,8 @@ protected function showDiscussionSection($reply = null, $edit = null)
         }
 
         if ($show) {
-            ptln('</div>', 2); // level2 hfeed
-            ptln('</div>'); // comment_wrapper
+            echo('  </div>'); // level2 hfeed
+            echo('</div>'); // comment_wrapper
         }
 
         // check for toggle print configuration
@@ -824,9 +824,9 @@ protected function showComment($cid, $data, $reply, $isVisible)
             $class .= ' reply';
         }
         // comment head with date and user data
-        ptln('<div class="hentry' . $class . '">', 4);
-        ptln('<div class="comment_head">', 6);
-        ptln('<a name="comment_' . $cid . '" id="comment_' . $cid . '"></a>', 8);
+        echo('    <div class="hentry' . $class . '">');
+        echo('      <div class="comment_head">');
+        echo('        <a name="comment_' . $cid . '" id="comment_' . $cid . '"></a>');
         $head = '<span class="vcard author">';
 
         // prepare variables
@@ -895,17 +895,17 @@ protected function showComment($cid, $data, $reply, $isVisible)
                 strftime('%Y-%m-%dT%H:%M:%SZ', $modified) . '">' . dformat($modified, $conf['dformat']) .
                 '</abbr>';
         }
-        ptln($head, 8);
-        ptln('</div>', 6); // class="comment_head"
+        echo('        '.$head);
+        echo('      </div>'); // class="comment_head"
 
         // main comment content
-        ptln('<div class="comment_body entry-content"' .
-            ($this->useAvatar() ? $this->getWidthStyle() : '') . '>', 6);
+        echo('      <div class="comment_body entry-content"' .
+            ($this->useAvatar() ? $this->getWidthStyle() : '') . '>');
         echo ($HIGH ? html_hilight($comment['xhtml'], $HIGH) : $comment['xhtml']) . DOKU_LF;
-        ptln('</div>', 6); // class="comment_body"
+        echo('      </div>'); // class="comment_body"
 
         if ($isVisible) {
-            ptln('<div class="comment_buttons">', 6);
+            echo('      <div class="comment_buttons">');
 
             // show reply button?
             if ($data['status'] == 1 && !$reply && $comment['show']
@@ -922,9 +922,9 @@ protected function showComment($cid, $data, $reply, $isVisible)
                 $this->showButton($cid, $label, 'toogle');
                 $this->showButton($cid, $lang['btn_delete'], 'delete');
             }
-            ptln('</div>', 6); // class="comment_buttons"
+            echo('      </div>'); // class="comment_buttons"
         }
-        ptln('</div>', 4); // class="hentry"
+        echo('    </div>'); // class="hentry"
     }
 
     /**
@@ -936,9 +936,9 @@ protected function showComment($cid, $data, $reply, $isVisible)
     protected function showReplyForm($cid, $reply)
     {
         if ($this->getConf('usethreading') && $reply == $cid) {
-            ptln('<div class="comment_replies reply">', 4);
+            echo('    <div class="comment_replies reply">');
             $this->showCommentForm('', 'add', $cid);
-            ptln('</div>', 4); // class="comment_replies"
+            echo('    </div>'); // class="comment_replies"
         }
     }
 
@@ -956,12 +956,12 @@ protected function showReplies($cid, &$data, $reply, &$isVisible)
         if (!empty($comment['replies'])) {
             return;
         }
-        ptln('<div class="comment_replies"' . $this->getWidthStyle() . '>', 4);
+        echo('    <div class="comment_replies"' . $this->getWidthStyle() . '>');
         $isVisible = ($comment['show'] && $isVisible);
         foreach ($comment['replies'] as $rid) {
             $this->showCommentWithReplies($rid, $data, $cid, $reply, $isVisible);
         }
-        ptln('</div>', 4);
+        echo('    </div>');
     }
 
     /**
@@ -1004,10 +1004,10 @@ protected function getWidthStyle()
      */
     protected function showDiscussionToggleButton()
     {
-        ptln('<div id="toggle_button" class="toggle_button">');
-        ptln('<input type="submit" id="discussion__btn_toggle_visibility" title="Toggle Visibiliy" class="button"'
+        echo('<div id="toggle_button" class="toggle_button">');
+        echo('<input type="submit" id="discussion__btn_toggle_visibility" title="Toggle Visibiliy" class="button"'
             . 'value="' . $this->getLang('toggle_display') . '">');
-        ptln('</div>');
+        echo('</div>');
     }
 
     /**
diff --git a/admin.php b/admin.php
index 55e6527..aace6f2 100644
--- a/admin.php
+++ b/admin.php
@@ -71,7 +71,7 @@ public function html()
 
         $num = $conf['recent'] ?: 20;
 
-        ptln('<h1>' . $this->getLang('menu') . '</h1>');
+        echo('<h1>' . $this->getLang('menu') . '</h1>');
 
         $threads = $this->getThreads();
 
@@ -83,20 +83,20 @@ public function html()
             $comments = $this->getComments($thread);
             $this->threadHead($thread);
             if ($comments === false) {
-                ptln('</div>', 6); // class="level2"
+                echo('      </div>'); // class="level2"
                 continue;
             }
 
-            ptln('<form method="post" action="' . wl($thread['id']) . '">', 8);
-            ptln('<div class="no">', 10);
-            ptln('<input type="hidden" name="do" value="admin" />', 10);
-            ptln('<input type="hidden" name="page" value="discussion" />', 10);
-            ptln('<input type="hidden" name="sectok" value="'.getSecurityToken().'" />', 10);
+            echo('        <form method="post" action="' . wl($thread['id']) . '">');
+            echo('          <div class="no">');
+            echo('          <input type="hidden" name="do" value="admin" />');
+            echo('          <input type="hidden" name="page" value="discussion" />');
+            echo('          <input type="hidden" name="sectok" value="'.getSecurityToken().'" />');
             echo html_buildlist($comments, 'admin_discussion', [$this, 'commentItem'], [$this, 'liComment']);
             $this->actionButtons();
-            ptln('</div>', 10); // class="no"
-            ptln('</form>', 8);
-            ptln('</div>', 6); // class="level2"
+            echo('          </div>'); // class="no"
+            echo('        </form>');
+            echo('      </div>'); // class="level2"
         }
         $this->browseDiscussionLinks($isMore, $first, $num);
 
@@ -330,11 +330,11 @@ protected function actionButtons()
     {
         global $lang;
 
-        ptln('<div class="comment_buttons">', 12);
-        ptln('<input type="submit" name="comment" value="' . $this->getLang('btn_show') . '" class="button" title="' . $this->getLang('btn_show') . '" />', 14);
-        ptln('<input type="submit" name="comment" value="' . $this->getLang('btn_hide') . '" class="button" title="' . $this->getLang('btn_hide') . '" />', 14);
-        ptln('<input type="submit" name="comment" value="' . $lang['btn_delete'] . '" class="button" title="' . $lang['btn_delete'] . '" />', 14);
-        ptln('</div>', 12); // class="comment_buttons"
+        echo('            <div class="comment_buttons">');
+        echo('              <input type="submit" name="comment" value="' . $this->getLang('btn_show') . '" class="button" title="' . $this->getLang('btn_show') . '" />');
+        echo('              <input type="submit" name="comment" value="' . $this->getLang('btn_hide') . '" class="button" title="' . $this->getLang('btn_hide') . '" />');
+        echo('              <input type="submit" name="comment" value="' . $lang['btn_delete'] . '" class="button" title="' . $lang['btn_delete'] . '" />');
+        echo('            </div>'); // class="comment_buttons"
     }
 
     /**
@@ -352,7 +352,7 @@ protected function browseDiscussionLinks($isMore, $first, $num)
 
         $params = ['do' => 'admin', 'page' => 'discussion'];
         $last = $first + $num;
-        ptln('<div class="level1">', 8);
+        echo('        <div class="level1">');
         $return = '';
         if ($first > 0) {
             $first -= $num;
@@ -360,24 +360,24 @@ protected function browseDiscussionLinks($isMore, $first, $num)
                 $first = 0;
             }
             $params['first'] = $first;
-            ptln('<p class="centeralign">', 8);
+            echo('        <p class="centeralign">');
             $return = '<a href="' . wl($ID, $params) . '" class="wikilink1">&lt;&lt; ' . $this->getLang('newer') . '</a>';
             if ($isMore) {
                 $return .= ' | ';
             } else {
-                ptln($return, 10);
-                ptln('</p>', 8);
+                echo('          '.$return);
+                echo('        </p>');
             }
         } elseif ($isMore) {
-            ptln('<p class="centeralign">', 8);
+            echo('        <p class="centeralign">');
         }
         if ($isMore) {
             $params['first'] = $last;
             $return .= '<a href="' . wl($ID, $params) . '" class="wikilink1">' . $this->getLang('older') . ' &gt;&gt;</a>';
-            ptln($return, 10);
-            ptln('</p>', 8);
+            echo('          '.$return);
+            echo('        </p>');
         }
-        ptln('</div>', 6); // class="level1"
+        echo('      </div>'); // class="level1"
     }
 
     /**