diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php
index dae13abf1359be3a1fc43ab8f7f053d7902245a4..8e65410d71ba0036ab4414d449e5e0a17172f3b4 100644
--- a/lib/tpl/dokuwiki/detail.php
+++ b/lib/tpl/dokuwiki/detail.php
@@ -92,11 +92,7 @@ header('X-UA-Compatible: IE=edge,chrome=1');
                     <h3 class="a11y"><?php echo $lang['page_tools']; ?></h3>
                     <div class="tools">
                         <ul>
-                            <?php
-                                $menu = new \dokuwiki\Menu\DetailMenu();
-                                echo $menu->getListItems();
-                                unset($menu);
-                            ?>
+                            <?php echo (new \dokuwiki\Menu\DetailMenu())->getListItems(); ?>
                         </ul>
                     </div>
                 </div>
diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php
index dfd4b12a2469120de58f3a560fba27e5042234d6..2d2151f9c496f4e41127d1580ce933d041dba6ad 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -73,11 +73,7 @@ $showSidebar = $hasSidebar && ($ACT=='show');
                 <h3 class="a11y"><?php echo $lang['page_tools']; ?></h3>
                 <div class="tools">
                     <ul>
-                        <?php
-                            $menu = new \dokuwiki\Menu\PageMenu();
-                            echo $menu->getListItems();
-                            unset($menu);
-                        ?>
+                        <?php echo (new \dokuwiki\Menu\PageMenu())->getListItems(); ?>
                     </ul>
                 </div>
             </div>
diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php
index 8ec47fbbf21a6c61a23d21ee32e28e4e84fbc1bb..a5ab929f337e0ff76b178b12999b61542ce2078a 100644
--- a/lib/tpl/dokuwiki/tpl_header.php
+++ b/lib/tpl/dokuwiki/tpl_header.php
@@ -46,9 +46,7 @@ if (!defined('DOKU_INC')) die();
                             tpl_userinfo(); /* 'Logged in as ...' */
                             echo '</li>';
                         }
-                        $menu = new \dokuwiki\Menu\UserMenu();
-                        echo $menu->getListItems('action ');
-                        unset($menu);
+                        echo (new \dokuwiki\Menu\UserMenu())->getListItems('action');
                     ?>
                 </ul>
             </div>
@@ -59,18 +57,10 @@ if (!defined('DOKU_INC')) die();
             <h3 class="a11y"><?php echo $lang['site_tools']; ?></h3>
             <?php tpl_searchform(); ?>
             <div class="mobileTools">
-                <?php
-                    $menu = new \dokuwiki\Menu\MobileMenu();
-                    echo $menu->getDropdown($lang['tools']);
-                    unset($menu);
-                ?>
+                <?php echo (new \dokuwiki\Menu\MobileMenu())->getDropdown($lang['tools']); ?>
             </div>
             <ul>
-                <?php
-                    $menu = new \dokuwiki\Menu\SiteMenu();
-                    echo $menu->getListItems('action ', false);
-                    unset($menu);
-                ?>
+                <?php echo (new \dokuwiki\Menu\SiteMenu())->getListItems('action ', false); ?>
             </ul>
         </div>