diff --git a/core/modules/action/lib/Drupal/action/ActionAdminManageForm.php b/core/modules/action/lib/Drupal/action/ActionAdminManageForm.php
index 74a61ad..f5271a0 100644
--- a/core/modules/action/lib/Drupal/action/ActionAdminManageForm.php
+++ b/core/modules/action/lib/Drupal/action/ActionAdminManageForm.php
@@ -10,7 +10,7 @@
 use Drupal\Core\Form\FormInterface;
 
 /**
- * Configuration form for configurable actions.
+ * Provides a configuration form for configurable actions.
  */
 class ActionAdminManageForm implements FormInterface {
 
@@ -24,8 +24,6 @@ public function getFormID() {
   /**
    * Implements \Drupal\Core\Form\FormInterface::buildForm().
    *
-   * @param array $form
-   * @param array $form_state
    * @param array $options
    *   An array of configurable actions.
    */
@@ -42,7 +40,9 @@ public function buildForm(array $form, array &$form_state, array $options = arra
       '#options' => $options,
       '#empty_option' => t('Choose an advanced action'),
     );
-    $form['parent']['actions'] = array('#type' => 'actions');
+    $form['parent']['actions'] = array(
+      '#type' => 'actions'
+    );
     $form['parent']['actions']['submit'] = array(
       '#type' => 'submit',
       '#value' => t('Create'),
@@ -53,7 +53,8 @@ public function buildForm(array $form, array &$form_state, array $options = arra
   /**
    * Implements \Drupal\Core\Form\FormInterface::validateForm().
    */
-  public function validateForm(array &$form, array &$form_state) { }
+  public function validateForm(array &$form, array &$form_state) {
+  }
 
   /**
    * Implements \Drupal\Core\Form\FormInterface::submitForm().
@@ -63,4 +64,5 @@ public function submitForm(array &$form, array &$form_state) {
       $form_state['redirect'] = 'admin/config/system/actions/configure/' . $form_state['values']['action'];
     }
   }
+
 }
diff --git a/core/modules/action/lib/Drupal/action/Controller/ActionController.php b/core/modules/action/lib/Drupal/action/Controller/ActionController.php
index e4b5d92..fc23d62 100644
--- a/core/modules/action/lib/Drupal/action/Controller/ActionController.php
+++ b/core/modules/action/lib/Drupal/action/Controller/ActionController.php
@@ -26,22 +26,28 @@ class ActionController implements ControllerInterface {
   protected $database;
 
   /**
-   * Implements \Drupal\Core\ControllerInterface::create().
-   */
-  public static function create(ContainerInterface $container) {
-    return new static($container->get('database'));
-  }
-
-  /**
    * Constructs a new ActionController.
    *
    * @param \Drupal\Core\Database\Connection $database
+   *   The database connection object to be used by this controller.
    */
   public function __construct(Connection $database) {
     $this->database = $database;
   }
+
+  /**
+   * Implements \Drupal\Core\ControllerInterface::create().
+   */
+  public static function create(ContainerInterface $container) {
+    return new static($container->get('database'));
+  }
+
   /**
    * Displays an overview of available and configured actions.
+   *
+   * @return
+   *   A render array containing a table of existing actions and the advanced
+   *   action creation form.
    */
   public function adminManage() {
     action_synchronize();
@@ -105,8 +111,14 @@ public function adminManage() {
       if (!empty($pager)) {
         $rows[] = array(array('data' => $pager, 'colspan' => '3'));
       }
-      $build['action_header'] = array('#markup' => '<h3>' . t('Available actions:') . '</h3>');
-      $build['action_table'] = array('#markup' => theme('table', array('header' => $header, 'rows' => $rows)));
+      $build['action_header'] = array(
+        '#markup' => '<h3>' . t('Available actions:') . '</h3>'
+      );
+      $build['action_table'] = array(
+        '#theme' => 'table',
+        '#header' => $header,
+        '#rows' => $rows,
+      );
     }
 
     if ($actions_map) {
@@ -121,7 +133,7 @@ public function adminManage() {
    */
   public function adminRemoveOrphans() {
     action_synchronize(TRUE);
-    return new RedirectResponse(url('admin/config/system/actions'));
+    return new RedirectResponse(url('admin/config/system/actions', array('absolute' => TRUE)));
   }
 
 }