diff --git a/admin.php b/admin.php
index 223e6af..b89107e 100644
--- a/admin.php
+++ b/admin.php
@@ -62,21 +62,23 @@ function getMenuText() {
     /**
      * output appropriate html
      *
+     * @author  Michael Hamann <michael@content-space.de>
      * @author  Gary Owen <gary@isection.co.uk>
      */
     function html() {
         ptln('<!-- Pagemove Plugin start -->');
         ptln( $this->locale_xhtml('pagemove') );
-        $this->_pm_form();
+        $this->printForm();
         ptln('<!-- Pagemove Plugin end -->');
     }
 
     /**
      * show the move and/or rename a page form
      *
+     * @author  Michael Hamann <michael@content-space.de>
      * @author  Gary Owen <gary@isection.co.uk>
      */
-    function _pm_form() {
+    function printForm() {
         global $ID;
 
         $ns = getNS($ID);
@@ -184,8 +186,6 @@ function handle() {
                 $helper->move_namespace($this->opts)) {
                 $ID = $helper->getNewID($INFO['id'], $this->opts['ns'], $this->opts['newns']);
                 $ACT = 'show';
-            } else {
-                return;
             }
         } else {
             // check that the pagename is valid
@@ -199,13 +199,9 @@ function handle() {
             }
 
             if ($helper->move_page($this->opts)) {
-                // @todo if the namespace is now empty, delete it
-
                 // Set things up to display the new page.
                 $ID = $this->opts['new_id'];
                 $ACT = 'show'; // this triggers a redirect to the page
-            } else {
-                return;
             }
         }
     }