diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module
index e2bff73..f6dbebc 100644
--- a/core/modules/toolbar/toolbar.module
+++ b/core/modules/toolbar/toolbar.module
@@ -67,7 +67,7 @@ function toolbar_menu() {
 /**
  * Page callback: Toggles the visibility of the toolbar drawer.
  *
- * @see toolbar_menu().
+ * @see toolbar_menu()
  */
 function toolbar_toggle_page() {
   global $base_path;
@@ -80,12 +80,12 @@ function toolbar_toggle_page() {
 /**
  * Formats an element used to toggle the toolbar drawer's visibility.
  *
- * @param $variables
+ * @param array $variables
  *   An associative array containing:
  *   - collapsed: A boolean value representing the toolbar drawer's visibility.
  *   - attributes: An associative array of HTML attributes.
  *
- * @return
+ * @return string
  *   An HTML string representing the element for toggling.
  *
  * @ingroup themable
@@ -104,7 +104,7 @@ function theme_toolbar_toggle($variables) {
 /**
  * Determines the current state of the toolbar drawer's visibility.
  *
- * @return
+ * @return boolean
  *   TRUE when drawer is collapsed, FALSE when it is expanded.
  */
 function _toolbar_is_collapsed() {
@@ -132,7 +132,7 @@ function toolbar_page_build(&$page) {
  * Since building the toolbar takes some time, it is done just prior to
  * rendering to ensure that it is built only if it will be displayed.
  *
- * @see toolbar_page_build().
+ * @see toolbar_page_build()
  */
 function toolbar_pre_render($toolbar) {
   $toolbar = array_merge($toolbar, toolbar_view());
@@ -182,7 +182,7 @@ function toolbar_system_info_alter(&$info, $file, $type) {
 /**
  * Builds the admin menu as a structured array ready for drupal_render().
  *
- * @return
+ * @return array
  *   Array of links and settings relating to the admin menu.
  */
 function toolbar_view() {
@@ -191,12 +191,12 @@ function toolbar_view() {
   $module_path = drupal_get_path('module', 'toolbar');
   $build = array(
     '#theme' => 'toolbar',
-    '#attached'=> array(
+    '#attached' => array(
       'js' => array(
         $module_path . '/toolbar.js',
         array(
           'data' => array('tableHeaderOffset' => 'Drupal.toolbar.height'),
-          'type' => 'setting'
+          'type' => 'setting',
         ),
       ),
       'css' => array(
@@ -212,7 +212,11 @@ function toolbar_view() {
     '#theme' => 'links__toolbar_menu',
     '#links' => $links,
     '#attributes' => array('id' => 'toolbar-menu'),
-    '#heading' => array('text' => t('Administrative toolbar'), 'level' => 'h2', 'class' => 'element-invisible'),
+    '#heading' => array(
+      'text' => t('Administrative toolbar'),
+      'level' => 'h2',
+      'class' => 'element-invisible',
+    ),
   );
 
   // Add logout & user account links or login link.
@@ -231,7 +235,7 @@ function toolbar_view() {
     );
   }
   else {
-     $links = array(
+    $links = array(
       'login' => array(
         'title' => t('Log in'),
         'href' => 'user',
@@ -283,12 +287,17 @@ function toolbar_view() {
 /**
  * Gets only the top level items below the 'admin' path.
  *
- * @return
+ * @return array
  *   An array containing a menu tree of top level items below the 'admin' path.
  */
 function toolbar_get_menu_tree() {
   $tree = array();
-  $admin_link = db_query('SELECT * FROM {menu_links} WHERE menu_name = :menu_name AND module = :module AND link_path = :path', array(':menu_name' => 'management', ':module' => 'system', ':path' => 'admin'))->fetchAssoc();
+  $args = array(
+    ':menu_name' => 'management',
+    ':module' => 'system',
+    ':path' => 'admin',
+  );
+  $admin_link = db_query('SELECT * FROM {menu_links} WHERE menu_name = :menu_name AND module = :module AND link_path = :path', $args)->fetchAssoc();
   if ($admin_link) {
     $tree = menu_build_tree('management', array(
       'expanded' => array($admin_link['mlid']),
@@ -306,7 +315,7 @@ function toolbar_get_menu_tree() {
  * Based on menu_navigation_links(). Adds path based IDs and icon placeholders
  * to the links.
  *
- * @return
+ * @return array
  *   An array of links as defined above.
  */
 function toolbar_menu_navigation_links($tree) {
@@ -345,7 +354,7 @@ function toolbar_menu_navigation_links($tree) {
  * Useful when using a menu generated by menu_tree_all_data() which does
  * not set the 'in_active_trail' flag on items.
  *
- * @return
+ * @return boolean
  *   TRUE when path is in the active trail, FALSE if not.
  *
  * @todo