diff --git a/core/modules/menu/lib/Drupal/menu/Tests/MenuNodeTest.php b/core/modules/menu/lib/Drupal/menu/Tests/MenuNodeTest.php
index d731718..fe62bb3 100644
--- a/core/modules/menu/lib/Drupal/menu/Tests/MenuNodeTest.php
+++ b/core/modules/menu/lib/Drupal/menu/Tests/MenuNodeTest.php
@@ -10,7 +10,7 @@
 use Drupal\simpletest\WebTestBase;
 
 /**
- * Test menu settings for nodes.
+ * Tests menu settings for nodes.
  */
 class MenuNodeTest extends WebTestBase {
 
@@ -21,6 +21,11 @@ class MenuNodeTest extends WebTestBase {
    */
   public static $modules = array('menu', 'test_page_test');
 
+  /**
+   * The profile to use with this test class.
+   *
+   * @var string
+   */
   protected $profile = 'standard';
 
   public static function getInfo() {
@@ -46,10 +51,10 @@ function setUp() {
   }
 
   /**
-   * Test creating, editing, deleting menu links via node form widget.
+   * Tests creating, editing, deleting menu links via node form widget.
    */
   function testMenuNodeFormWidget() {
-    // Enable Tools menu as available menu.
+    // Enable Navigation menu as available menu.
     $edit = array(
       'menu_options[tools]' => 1,
     );
diff --git a/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php b/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php
index 88283cc..8da1f83 100644
--- a/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php
+++ b/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php
@@ -9,6 +9,9 @@
 
 use Drupal\simpletest\WebTestBase;
 
+/**
+* Tests the menu module.
+*/
 class MenuTest extends WebTestBase {
 
   /**
@@ -18,9 +21,32 @@ class MenuTest extends WebTestBase {
    */
   public static $modules = array('menu', 'block');
 
+ /**
+   * An administrative user.
+   *
+   * @var string
+   */
   protected $big_user;
+
+  /**
+   * A standard user.
+   *
+   * @var string
+   */
   protected $std_user;
+
+  /**
+   * A menu definition.
+   *
+   * @var
+   */
   protected $menu;
+
+  /**
+   * Menu items.
+   *
+   * @var string
+   */
   protected $items;
 
   public static function getInfo() {
@@ -42,7 +68,10 @@ function setUp() {
   }
 
   /**
-   * Login users, add menus and menu links, and test menu functionality through the admin and user interfaces.
+   * Tests menu functionality through the admin and user interfaces.
+   *
+   * This test logs in users, adds menus and menu links, and tests menu
+   * functionality through the admin and user interfaces.
    */
   function testMenu() {
     // Login the user.
@@ -89,7 +118,7 @@ function testMenu() {
   }
 
   /**
-   * Add custom menu using CRUD functions.
+   * Adds a custom menu using CRUD functions.
    */
   function addCustomMenuCRUD() {
     // Add a new custom menu.
@@ -116,7 +145,7 @@ function addCustomMenuCRUD() {
   }
 
   /**
-   * Add custom menu.
+   * Adds a custom menu.
    */
   function addCustomMenu() {
 
@@ -166,9 +195,10 @@ function addCustomMenu() {
   }
 
   /**
-   * Delete custom menu.
+   * Deletes a custom menu.
    *
-   * @param string $menu_name Custom menu name.
+   * @param string $menu_name
+   *   A custom menu name.
    */
   function deleteCustomMenu($menu) {
     $menu_name = $this->menu->id();
@@ -194,6 +224,9 @@ function deleteCustomMenu($menu) {
 
   /**
    * Tests menu functionality.
+   *
+   * @param string $menu_name
+   *   (optional) The name of menu.
    */
   function doMenuTests($menu_name) {
     // Add nodes to use as links for menu links.
@@ -264,7 +297,7 @@ function doMenuTests($menu_name) {
   }
 
   /**
-   * Add and remove a menu link with a query string and fragment.
+   * Tests addition and removal of a menu link with a query string and fragment.
    */
   function testMenuQueryAndFragment() {
     $this->drupalLogin($this->big_user);
@@ -284,12 +317,18 @@ function testMenuQueryAndFragment() {
   }
 
   /**
-   * Add a menu link using the menu module UI.
+   * Adds a menu link using the menu module UI.
    *
-   * @param integer $plid Parent menu link id.
-   * @param string $link Link path.
-   * @param string $menu_name Menu name.
-   * @param string $weight Menu weight
+   * @param integer $plid
+   *   (optional) Parent menu link ID.
+   * @param string $link
+   *   (optional) Link path.
+   * @param string $menu_name
+   *   (optional) Menu name.
+   * @param bool $expanded
+   *   (optional) A Boolean indicating whether the menu should be expanded.
+   * @param string $weight
+   *   (optional) Menu weight.
    *
    * @return \Drupal\menu_link\Plugin\Core\Entity\MenuLink $menu_link
    *   A menu link entity.
@@ -324,9 +363,10 @@ function addMenuLink($plid = 0, $link = '<front>', $menu_name = 'tools', $expand
   }
 
   /**
-   * Attempt to add menu link with invalid path or no access permission.
+   * Attempts to add a menu link with invalid path or no access permission.
    *
-   * @param string $menu_name Menu name.
+   * @param string $menu_name
+   *   (optional) The menu name.
    */
   function addInvalidMenuLink($menu_name = 'tools') {
     foreach (array('-&-', 'admin/people/permissions', '#') as $link_path) {
@@ -340,12 +380,16 @@ function addInvalidMenuLink($menu_name = 'tools') {
   }
 
   /**
-   * Verify a menu link using the menu module UI.
+   * Verifies a menu link using the menu module UI.
    *
-   * @param array $item Menu link.
-   * @param object $item_node Menu link content node.
-   * @param array $parent Parent menu link.
-   * @param object $parent_node Parent menu link content node.
+   * @param array $item
+   *   A menu link.
+   * @param object $item_node
+   *   Menu link content node.
+   * @param array $parent
+   *   (optional) Parent menu link.
+   * @param object $parent_node
+   *   (optional) Parent menu link content node.
    */
   function verifyMenuLink($item, $item_node, $parent = NULL, $parent_node = NULL) {
     // View home page.
@@ -375,7 +419,14 @@ function verifyMenuLink($item, $item_node, $parent = NULL, $parent_node = NULL)
   }
 
   /**
-   * Change the parent of a menu link using the menu module UI.
+   * Changes the parent of a menu link using the menu module UI.
+   *
+   * @param array $item
+   *   A menu link.
+   * @param integer $plid
+   *   Parent menu link ID.
+   * @param string $menu_name
+   *   Menu name.
    */
   function moveMenuLink($item, $plid, $menu_name) {
     $mlid = $item['mlid'];
@@ -388,9 +439,10 @@ function moveMenuLink($item, $plid, $menu_name) {
   }
 
   /**
-   * Modify a menu link using the menu module UI.
+   * Modifies a menu link using the menu module UI.
    *
-   * @param array $item Menu link passed by reference.
+   * @param array $item
+   *   Menu link passed by reference.
    */
   function modifyMenuLink(&$item) {
     $item['link_title'] = $this->randomName(16);
@@ -410,10 +462,12 @@ function modifyMenuLink(&$item) {
   }
 
   /**
-   * Reset a standard menu link using the menu module UI.
+   * Resets a standard menu link using the menu module UI.
    *
-   * @param array $item Menu link.
-   * @param string $old_title Original title for menu link.
+   * @param array $item
+   *   Menu link.
+   * @param string $old_title
+   *   Original title for menu link.
    */
   function resetMenuLink($item, $old_title) {
     $mlid = $item['mlid'];
@@ -431,9 +485,10 @@ function resetMenuLink($item, $old_title) {
   }
 
   /**
-   * Delete a menu link using the menu module UI.
+   * Deletes a menu link using the menu module UI.
    *
-   * @param array $item Menu link.
+   * @param array $item
+   *   Menu link.
    */
   function deleteMenuLink($item) {
     $mlid = $item['mlid'];
@@ -450,9 +505,9 @@ function deleteMenuLink($item) {
   }
 
   /**
-   * Alternately disable and enable a menu link.
+   * Disables and enables a menu link alternatively.
    *
-   * @param $item
+   * @param array $item
    *   Menu link.
    */
   function toggleMenuLink($item) {
@@ -469,9 +524,9 @@ function toggleMenuLink($item) {
   }
 
   /**
-   * Disable a menu link.
+   * Disables a menu link.
    *
-   * @param $item
+   * @param array $item
    *   Menu link.
    */
   function disableMenuLink($item) {
@@ -485,9 +540,9 @@ function disableMenuLink($item) {
   }
 
   /**
-   * Enable a menu link.
+   * Enables a menu link.
    *
-   * @param $item
+   * @param array $item
    *   Menu link.
    */
   function enableMenuLink($item) {
@@ -500,12 +555,11 @@ function enableMenuLink($item) {
   }
 
   /**
-   * Fetch the menu item from the database and compare it to the specified
-   * array.
+   * Fetches the menu item from the database and compares it to specified array.
    *
    * @param $mlid
-   *   Menu item id.
-   * @param $item
+   *   Menu item ID.
+   * @param $expected_item
    *   Array containing properties to verify.
    */
   function assertMenuLink($mlid, array $expected_item) {
@@ -524,7 +578,10 @@ function assertMenuLink($mlid, array $expected_item) {
   }
 
   /**
-   * Get standard menu link.
+   * Gets standard menu link.
+   *
+   * @return
+   *   A standard menu link.
    */
   private function getStandardMenuLink() {
     $mlid = 0;
@@ -538,7 +595,7 @@ private function getStandardMenuLink() {
       $mlid = reset($result);
     }
 
-    $this->assertTrue($mlid > 0, 'Standard menu link id was found');
+    $this->assertTrue($mlid > 0, 'Standard menu link ID was found');
     // Load menu link.
     // Use api function so that link is translated for rendering.
     $item = entity_load('menu_link', $mlid);
@@ -547,9 +604,10 @@ private function getStandardMenuLink() {
   }
 
   /**
-   * Verify the logged in user has the desired access to the various menu nodes.
+   * Verifies the logged in user has the desired access to various menu nodes.
    *
-   * @param integer $response HTTP response code.
+   * @param integer $response
+   *   (optional) The HTTP response code.
    */
   private function verifyAccess($response = 200, $menu_name = 'tools') {
     // View menu help node.
diff --git a/core/modules/menu/menu.admin.css b/core/modules/menu/menu.admin.css
index efbfe75..85a1e35 100644
--- a/core/modules/menu/menu.admin.css
+++ b/core/modules/menu/menu.admin.css
@@ -1,3 +1,8 @@
+/**
+ * @file
+ * CSS for the menu overview form.
+ */
+
 .menu-enabled {
   width: 70px;
 }
diff --git a/core/modules/menu/menu.admin.inc b/core/modules/menu/menu.admin.inc
index 56d5110..92120c7 100644
--- a/core/modules/menu/menu.admin.inc
+++ b/core/modules/menu/menu.admin.inc
@@ -11,7 +11,12 @@
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 
 /**
- * Menu callback which shows an overview page of all the custom menus and their descriptions.
+ * Page callback: Shows an overview page of all the custom menus.
+ *
+ * @return
+ *   An HTML string containing a themed table of all custom menus.
+ *
+ * @see menu_menu()
  */
 function menu_overview_page() {
   return drupal_container()->get('plugin.manager.entity')
@@ -49,10 +54,10 @@ function menu_menu_edit(Menu $menu) {
 }
 
 /**
- * Form constructor to edit an entire menu tree at once.
+ * Page callback: Form constructor for the menu overview form.
  *
- * Shows for one menu the menu links accessible to the current user and
- * relevant operations.
+ * Shows a custom menu's menu links that are accessible to the current user and
+ * relevant operations. Allows editing an entire menu tree at once.
  *
  * This form constructor can be integrated as a section into another form. It
  * relies on the following keys in $form_state:
@@ -61,6 +66,10 @@ function menu_menu_edit(Menu $menu) {
  *   form.
  * Forms integrating this section should call menu_overview_form_submit() from
  * their form submit handler.
+ *
+ * @see menu_menu()
+ * @see menu_overview_form_submit()
+ * @ingroup forms
  */
 function menu_overview_form($form, &$form_state) {
   global $menu_admin;
@@ -115,12 +124,15 @@ function menu_overview_form($form, &$form_state) {
 }
 
 /**
- * Recursive helper function for menu_overview_form().
+ * Helps menu_overview_form() build the menu overview form.
  *
  * @param $tree
- *   The menu_tree retrieved by menu_tree_data.
+ *   The array of menu items retrieved by menu_tree_data().
  * @param $delta
- *   The default number of menu items used in the menu weight selector is 50.
+ *   (optional) The default number of items to use in the menu weight selector.
+ *
+ * @return
+ *   An array containing a tree of menu item form elements.
  */
 function _menu_overview_tree_form($tree, $delta = 50) {
   $form = &drupal_static(__FUNCTION__, array('#tree' => TRUE));
@@ -199,7 +211,7 @@ function _menu_overview_tree_form($tree, $delta = 50) {
 }
 
 /**
- * Submit handler for the menu overview form.
+ * Form submission handler for menu_overview_form().
  *
  * This function takes great care in saving parent items first, then items
  * underneath them. Saving items in the incorrect order can break the menu tree.
@@ -221,6 +233,7 @@ function menu_overview_form_submit($complete_form, &$form_state) {
   // parent. To prevent this, save items in the form in the same order they
   // are sent, ensuring parents are saved first, then their children.
   // See http://drupal.org/node/181126#comment-632270
+
   $order = array_flip(array_keys($input));
   // Update our original form with the new order.
   $form = array_intersect_key(array_merge($order, $form), $form);
@@ -310,7 +323,16 @@ function theme_menu_overview_form($variables) {
 }
 
 /**
- * Menu callback; check access and get a confirm form for deletion of a custom menu.
+ * Page callback: Gets a confirmation form for the deletion of a custom menu.
+ *
+ * @param $menu
+ *   An array representing the custom menu.
+ *
+ * @return array
+ *   A renderable array.
+ *
+ * @see menu_delete_menu_confirm()
+ * @see menu_menu()
  */
 function menu_delete_menu_page(Menu $menu) {
   // System-defined menus may not be deleted.
@@ -322,7 +344,13 @@ function menu_delete_menu_page(Menu $menu) {
 }
 
 /**
- * Build a confirm form for deletion of a custom menu.
+ * Form constructor for a confirmation form for deleting a custom menu.
+ *
+ * @param $menu
+ *   An array representing the custom menu.
+ *
+ * @see menu_delete_menu_confirm_submit()
+ * @ingroup forms
  */
 function menu_delete_menu_confirm($form, &$form_state, Menu $menu) {
   $form['#menu'] = $menu;
@@ -337,7 +365,9 @@ function menu_delete_menu_confirm($form, &$form_state, Menu $menu) {
 }
 
 /**
- * Delete a custom menu and all links in it.
+ * Form submission handler for menu_delete_menu_confirm().
+ *
+ * Deletes a custom menu and all links in it.
  */
 function menu_delete_menu_confirm_submit($form, &$form_state) {
   $menu = $form['#menu'];
@@ -370,10 +400,15 @@ function menu_delete_menu_confirm_submit($form, &$form_state) {
 }
 
 /**
- * Returns whether a menu name already exists.
+ * Checks whether a menu name already exists.
+ *
+ * @param $value
+ *   The menu name.
+ *
+ * @return
+ *   TRUE if the menu name already exists; FALSE otherwise.
  *
  * @see menu_edit_menu()
- * @see form_validate_machine_name()
  */
 function menu_edit_menu_name_exists($value) {
   $custom_exists = entity_load('menu', $value);
@@ -385,7 +420,9 @@ function menu_edit_menu_name_exists($value) {
 }
 
 /**
- * Submit function for adding or editing a custom menu.
+ * Form submission handler for menu_edit_menu().
+ *
+ * Handles adding or editing a custom menu.
  */
 function menu_edit_menu_submit($form, &$form_state) {
   $menu = $form_state['values'];
@@ -417,7 +454,7 @@ function menu_edit_menu_submit($form, &$form_state) {
 }
 
 /**
- * Menu callback: Provides the menu link submission form.
+ * Page callback: Provides the menu link submission form.
  *
  * @param \Drupal\system\Plugin\Core\Entity\Menu $menu
  *   An entity representing a custom menu.
@@ -436,8 +473,7 @@ function menu_link_add(Menu $menu) {
 }
 
 /**
- * Menu callback; Check access and present a confirm form for deleting a menu
- * link.
+ * Page callback: Check access and show a confirm form for deleting a menu link.
  */
 function menu_link_delete_page(MenuLink $menu_link) {
   // Links defined via hook_menu may not be deleted. Updated items are an
@@ -472,7 +508,7 @@ function menu_link_delete_form_submit($form, &$form_state) {
 }
 
 /**
- * Menu callback; Reset a single modified menu link.
+ * Page callback: Reset a single modified menu link.
  */
 function menu_link_reset_form($form, &$form_state, MenuLink $menu_link) {
   $form['#menu_link'] = $menu_link;
@@ -494,10 +530,11 @@ function menu_link_reset_form_submit($form, &$form_state) {
 }
 
 /**
- * Menu callback; Build the form presenting menu configuration options.
+ * Page callback: Form constructor for the menu configuration form.
  *
- * @ingroup forms
  * @see menu_configure_submit()
+ * @see menu_menu()
+ * @ingroup forms
  */
 function menu_configure($form, &$form_state) {
   $config = config('menu.settings');
diff --git a/core/modules/menu/menu.admin.js b/core/modules/menu/menu.admin.js
index 530c8b6..5d7f9e8 100644
--- a/core/modules/menu/menu.admin.js
+++ b/core/modules/menu/menu.admin.js
@@ -1,3 +1,8 @@
+/**
+ * @file
+ * Adds menu options to the node type form.
+ */
+
 (function ($) {
 
 "use strict";
diff --git a/core/modules/menu/menu.api.php b/core/modules/menu/menu.api.php
index 7b949ad..94ac196 100644
--- a/core/modules/menu/menu.api.php
+++ b/core/modules/menu/menu.api.php
@@ -20,8 +20,8 @@
  * @param \Drupal\system\Plugin\Core\Entity\Menu $menu
  *   A menu entity.
  *
- * @see hook_menu_update()
  * @see hook_menu_delete()
+ * @see hook_menu_update()
  */
 function hook_menu_insert($menu) {
   // For example, we track available menus in a variable.
diff --git a/core/modules/menu/menu.js b/core/modules/menu/menu.js
index 77baddb..ac92d98 100644
--- a/core/modules/menu/menu.js
+++ b/core/modules/menu/menu.js
@@ -1,3 +1,8 @@
+/**
+ * @file
+ * Adds menu fields to the node form.
+ */
+
 (function ($) {
 
 "use strict";
@@ -17,7 +22,7 @@ Drupal.behaviors.menuDetailsSummaries = {
 };
 
 /**
- * Automatically fill in a menu link title, if possible.
+ * Fills in a menu link title automatically, if possible.
  */
 Drupal.behaviors.menuLinkAutomaticTitle = {
   attach: function (context) {
@@ -33,8 +38,9 @@ Drupal.behaviors.menuLinkAutomaticTitle = {
       if (!($checkbox.length && $link_title.length && $title.length)) {
         return;
       }
-      // If there is a link title already, mark it as overridden. The user expects
-      // that toggling the checkbox twice will take over the node's title.
+      // If there is a link title already, mark it as overridden. The user
+      // expects that toggling the checkbox twice will take over the node's
+      // title.
       if ($checkbox.is(':checked') && $link_title.val().length) {
         $link_title.data('menuLinkAutomaticTitleOveridden', true);
       }
diff --git a/core/modules/menu/menu.module b/core/modules/menu/menu.module
index c300ed6..eb33f4e 100644
--- a/core/modules/menu/menu.module
+++ b/core/modules/menu/menu.module
@@ -20,8 +20,9 @@
 use Drupal\menu_link\MenuLinkStorageController;
 
 /**
- * Maximum length of menu name as entered by the user. Database length is 32
- * and we add a menu- prefix.
+ * Maximum length of menu name as entered by the user.
+ *
+ * Database length is 32 and we add a menu- prefix.
  */
 const MENU_MAX_MENU_NAME_LENGTH_UI = 27;
 
@@ -191,7 +192,7 @@ function menu_theme() {
 /**
  * Implements hook_enable().
  *
- * Add a link for each custom menu.
+ * Adds a link for each custom menu.
  */
 function menu_enable() {
   menu_router_rebuild();
@@ -224,10 +225,11 @@ function menu_enable() {
 }
 
 /**
- * Load the data for a single custom menu.
+ * Loads the data for a single custom menu.
  *
  * @param $menu_name
  *   The unique name of a custom menu to load.
+ *
  * @return
  *   Array defining the custom menu, or FALSE if the menu doesn't exist.
  */
@@ -236,7 +238,7 @@ function menu_load($menu_name) {
 }
 
 /**
- * Implements hook_menu_insert()
+ * Implements hook_menu_insert().
  */
 function menu_menu_insert(Menu $menu) {
   menu_cache_clear_all();
@@ -348,8 +350,13 @@ function menu_parent_options(array $menus, MenuLink $menu_link = NULL, $type = N
 }
 
 /**
- * Page callback.
- * Get all the available menus and menu items as a JavaScript array.
+ * Page callback: Gets all the available menus and menu items.
+ *
+ * @return Symfony\Component\HttpFoundation\JsonResponse
+ *   A JSON response object containing the menu and menu items as a JavaScript
+ *   array.
+ *
+ * @see menu_menu()
  */
 function menu_parent_options_js() {
   $available_menus = array();
@@ -364,7 +371,18 @@ function menu_parent_options_js() {
 }
 
 /**
- * Helper function to get the items of the given menu.
+ * Gets the items of the given menus.
+ *
+ * @param $menus
+ *   An array of menu names and titles, such as from menu_get_menus().
+ * @param $available_menus
+ *   An array of menu names and titles of menus that $item can be assigned to.
+ * @param $item
+ *   The menu item used to generate the parent depth limit. If
+ *   $item['mlid'] == 0 then the complete tree is returned.
+ *
+ * @return
+ *   An array of menu titles to be used as options in a select form element.
  */
 function _menu_get_options($menus, $available_menus, $item) {
   // If the item has children, there is an added limit to the depth of valid parents.
@@ -387,7 +405,23 @@ function _menu_get_options($menus, $available_menus, $item) {
 }
 
 /**
- * Recursive helper function for menu_parent_options().
+ * Adds menu links to an option array.
+ *
+ * Helper function for menu_parent_options().
+ *
+ * @param $tree
+ *   A tree of menu links in an array.
+ * @param $menu_name
+ *   The name of the menu represented in $tree.
+ * @param $indent
+ *   Text to prefix indented menu items with.
+ * @param $options
+ *   An array of menu items to be used as options in a select form element.
+ *   This array is updated by reference.
+ * @param $exclude
+ *   A menu link ID to exclude from the options.
+ * @param $depth_limit
+ *   Maximum depth of links to retrieve.
  */
 function _menu_parents_recurse($tree, $menu_name, $indent, &$options, $exclude, $depth_limit) {
   foreach ($tree as $data) {
@@ -435,7 +469,12 @@ function menu_node_update(Node $node) {
 }
 
 /**
+ * Updates menus when a node is saved.
+ *
  * Helper for hook_node_insert() and hook_node_update().
+ *
+ * @param $node
+ *   The node that is being saved.
  */
 function menu_node_save(Node $node) {
   if (isset($node->menu)) {
@@ -535,7 +574,13 @@ function menu_node_prepare(Node $node) {
 }
 
 /**
- * Find the depth limit for items in the parent select.
+ * Finds the depth limit for items in the parent select.
+ *
+ * @param $item
+ *   An array representing a menu link.
+ *
+ * @return
+ *   The depth limit.
  */
 function _menu_parent_depth_limit($item) {
   return MENU_MAX_DEPTH - 1 - (($item['mlid'] && $item['has_children']) ? entity_get_controller('menu_link')->findChildrenRelativeDepth($item) : 0);
@@ -549,7 +594,8 @@ function _menu_parent_depth_limit($item) {
  * @see menu_node_submit()
  */
 function menu_form_node_form_alter(&$form, $form_state) {
-  // Generate a list of possible parents (not including this link or descendants).
+  // Generate a list of possible parents (not including this link or
+  // descendants).
   // @todo This must be handled in a #process handler.
   $node = $form_state['controller']->getEntity($form_state);
   $link = $node->menu;
@@ -627,7 +673,7 @@ function menu_form_node_form_alter(&$form, $form_state) {
   // Get number of items in menu so the weight selector is sized appropriately.
   $delta = entity_get_controller('menu_link')->countMenuLinks($link->menu_name);
   if ($delta < 50) {
-    // Old hardcoded value
+    // Old hardcoded value.
     $delta = 50;
   }
   $form['menu']['link']['weight'] = array(
@@ -692,8 +738,8 @@ function menu_form_node_type_form_alter(&$form, $form_state) {
     '#attributes' => array('class' => array('menu-title-select')),
   );
 
-  // Call Drupal.menuUpdateParentList() to filter the list of
-  // available default parent menu items based on the selected menus.
+  // Call Drupal.menuUpdateParentList() to filter the list of available default
+  // parent menu items based on the selected menus.
   drupal_add_js(
     '(function ($) { Drupal.menuUpdateParentList(); })(jQuery);',
     array('scope' => 'footer', 'type' => 'inline')
@@ -701,11 +747,12 @@ function menu_form_node_type_form_alter(&$form, $form_state) {
 }
 
 /**
- * Return an associative array of the custom menus names.
+ * Returns an associative array of the custom menus' names.
  *
  * @param $all
- *   If FALSE return only user-added menus, or if TRUE also include
+ *   (optional) If FALSE return only user-added menus, or if TRUE also include
  *   the menus defined by the system.
+ *
  * @return
  *   An array with the machine-readable names as the keys, and human-readable
  *   titles as the values.