diff --git a/core/modules/menu/menu.admin.inc b/core/modules/menu/menu.admin.inc
index be2db82..352d69e 100644
--- a/core/modules/menu/menu.admin.inc
+++ b/core/modules/menu/menu.admin.inc
@@ -61,7 +61,7 @@ function menu_overview_form($form, &$form_state, $menu) {
   foreach ($result as $item) {
     $links[] = $item;
   }
-  $delta = count($links) > 50 ? count($links) : 50;
+  $delta = max(count($links), 50);
   $tree = menu_tree_data($links);
   $node_links = array();
   menu_tree_collect_node_links($tree, $node_links);
@@ -92,8 +92,7 @@ function menu_overview_form($form, &$form_state, $menu) {
  * @param $tree
  *   The menu_tree retrieved by menu_tree_data.
  * @param $delta
- *   The total number of items in this menu; used in the menu weight selector.
- *   Note: Defaults to 50 for backportability.
+ *   The default number of menu items used in the menu weight selector is 50.
  */
 function _menu_overview_tree_form($tree, $delta = 50) {
   $form = &drupal_static(__FUNCTION__, array('#tree' => TRUE));
@@ -357,7 +356,7 @@ function menu_edit_item($form, &$form_state, $type, $item, $menu) {
     '#attributes' => array('class' => array('menu-title-select')),
   );
 
-  // Get number of items in menu so the weight selector is sized appropriately
+  // Get number of items in menu so the weight selector is sized appropriately.
   $sql = "SELECT COUNT(*) FROM {menu_links} WHERE menu_name = :menu";
   $result = db_query($sql, array(':menu' => $item['menu_name']), array('fetch' => PDO::FETCH_ASSOC));
   foreach ($result as $row) {
@@ -365,8 +364,10 @@ function menu_edit_item($form, &$form_state, $type, $item, $menu) {
       $delta = $menu_item_count;
     }
   }
-  if ($delta < 50)
-    $delta = 50; // Old hardcoded value
+  if ($delta < 50) {
+    // Old hardcoded value.
+    $delta = 50;
+  }
   $form['weight'] = array(
     '#type' => 'weight',
     '#title' => t('Weight'),
diff --git a/core/modules/menu/menu.module b/core/modules/menu/menu.module
index 46e2701..8f68d0c 100644
--- a/core/modules/menu/menu.module
+++ b/core/modules/menu/menu.module
@@ -705,7 +705,7 @@ function menu_form_node_form_alter(&$form, $form_state) {
     '#attributes' => array('class' => array('menu-parent-select')),
   );
 
-  // Get number of items in menu so the weight selector is sized appropriately
+  // Get number of items in menu so the weight selector is sized appropriately.
   $sql = "SELECT COUNT(*) FROM {menu_links} WHERE menu_name = :menu";
   $result = db_query($sql, array(':menu' => $link['menu_name']), array('fetch' => PDO::FETCH_ASSOC));
   foreach ($result as $row) {
@@ -713,8 +713,10 @@ function menu_form_node_form_alter(&$form, $form_state) {
       $delta = $menu_items;
     }
   }
-  if ($delta < 50)
-    $delta = 50; // Old hardcoded value
+  if ($delta < 50) {
+    // Old hardcoded value
+    $delta = 50;
+  }
   $form['menu']['link']['weight'] = array(
     '#type' => 'weight',
     '#title' => t('Weight'),