diff --git a/includes/theme.inc b/includes/theme.inc
index 42c54783f1f..0b75847bc62 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -754,7 +754,7 @@ function drupal_find_theme_functions($cache, $prefixes) {
 function drupal_find_theme_templates($cache, $extension, $path) {
   $templates = array();
 
-  // Escape the dots in the extension.
+  // Escape the periods in the extension.
   $regex = str_replace('.', '\.', $extension) .'$';
 
   // Because drupal_system_listing works the way it does, we check for real
diff --git a/includes/xmlrpc.inc b/includes/xmlrpc.inc
index 6dd79b8c372..59210a4598f 100644
--- a/includes/xmlrpc.inc
+++ b/includes/xmlrpc.inc
@@ -1,12 +1,13 @@
 <?php
 // $Id$
 
-/*
-  Drupal XML-RPC library. Based on the IXR - The Incutio XML-RPC Library - (c) Incutio Ltd 2002-2005
-   Version 1.7 (beta) - Simon Willison, 23rd May 2005
-   Site:   http://scripts.incutio.com/xmlrpc/
-   Manual: http://scripts.incutio.com/xmlrpc/manual.php
-   This version is made available under the GNU GPL License
+/**
+ * @file
+ * Drupal XML-RPC library. Based on the IXR - The Incutio XML-RPC Library - (c) Incutio Ltd 2002-2005
+ * Version 1.7 (beta) - Simon Willison, 23rd May 2005
+ * Site:   http://scripts.incutio.com/xmlrpc/
+ * Manual: http://scripts.incutio.com/xmlrpc/manual.php
+ * This version is made available under the GNU GPL License
  */
 
 /**
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module
index add89541a05..3dc172b2c07 100644
--- a/modules/aggregator/aggregator.module
+++ b/modules/aggregator/aggregator.module
@@ -606,21 +606,14 @@ function aggregator_refresh($feed) {
     case 307:
       // Filter the input data:
       if (aggregator_parse_feed($result->data, $feed)) {
-
         $modified = empty($result->headers['Last-Modified']) ? 0 : strtotime($result->headers['Last-Modified']);
 
-        /*
-        ** Prepare the channel data:
-        */
-
+        // Prepare the channel data.
         foreach ($channel as $key => $value) {
           $channel[$key] = trim($value);
         }
 
-        /*
-        ** Prepare the image data (if any):
-        */
-
+        // Prepare the image data (if any).
         foreach ($image as $key => $value) {
           $image[$key] = trim($value);
         }
@@ -634,16 +627,10 @@ function aggregator_refresh($feed) {
         }
 
         $etag = empty($result->headers['ETag']) ? '' : $result->headers['ETag'];
-        /*
-        ** Update the feed data:
-        */
-
+        // Update the feed data.
         db_query("UPDATE {aggregator_feed} SET url = '%s', checked = %d, link = '%s', description = '%s', image = '%s', etag = '%s', modified = %d WHERE fid = %d", $feed['url'], time(), $channel['LINK'], $channel['DESCRIPTION'], $image, $etag, $modified, $feed['fid']);
 
-        /*
-        ** Clear the cache:
-        */
-
+        // Clear the cache.
         cache_clear_all();
 
         watchdog('aggregator', 'There is new syndicated content from %site.', array('%site' => $feed['title']));
diff --git a/modules/color/color.module b/modules/color/color.module
index 666c2f10218..a65271ba50f 100644
--- a/modules/color/color.module
+++ b/modules/color/color.module
@@ -627,9 +627,11 @@ function _color_hsl2rgb($hsl) {
   $l = $hsl[2];
   $m2 = ($l <= 0.5) ? $l * ($s + 1) : $l + $s - $l*$s;
   $m1 = $l * 2 - $m2;
-  return array(_color_hue2rgb($m1, $m2, $h + 0.33333),
-               _color_hue2rgb($m1, $m2, $h),
-               _color_hue2rgb($m1, $m2, $h - 0.33333));
+  return array(
+    _color_hue2rgb($m1, $m2, $h + 0.33333),
+    _color_hue2rgb($m1, $m2, $h),
+    _color_hue2rgb($m1, $m2, $h - 0.33333),
+  );
 }
 
 /**
diff --git a/modules/profile/profile.module b/modules/profile/profile.module
index 297d6c0ab3e..229dc91b552 100644
--- a/modules/profile/profile.module
+++ b/modules/profile/profile.module
@@ -266,13 +266,15 @@ function profile_view_field($user, $field) {
         // Note: Avoid PHP's date() because it does not handle dates before
         // 1970 on Windows. This would make the date field useless for e.g.
         // birthdays.
-        $replace = array('d' => sprintf('%02d', $value['day']),
-                         'j' => $value['day'],
-                         'm' => sprintf('%02d', $value['month']),
-                         'M' => map_month($value['month']),
-                         'Y' => $value['year'],
-                         'H:i' => NULL,
-                         'g:ia' => NULL);
+        $replace = array(
+          'd' => sprintf('%02d', $value['day']),
+          'j' => $value['day'],
+          'm' => sprintf('%02d', $value['month']),
+          'M' => map_month($value['month']),
+          'Y' => $value['year'],
+          'H:i' => NULL,
+          'g:ia' => NULL,
+        );
         return strtr($format, $replace);
       case 'list':
         $values = split("[,\n\r]", $value);
diff --git a/modules/user/user.admin.inc b/modules/user/user.admin.inc
index 917a480ccaf..00607f1da31 100644
--- a/modules/user/user.admin.inc
+++ b/modules/user/user.admin.inc
@@ -44,10 +44,11 @@ function user_filter_form() {
   $filters = user_filters();
 
   $i = 0;
-  $form['filters'] = array('#type' => 'fieldset',
-                       '#title' => t('Show only users where'),
-                       '#theme' => 'user_filters',
-                     );
+  $form['filters'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Show only users where'),
+    '#theme' => 'user_filters',
+  );
   foreach ($session as $filter) {
     list($type, $value) = $filter;
     // Merge an array of arrays into one if necessary.
@@ -63,24 +64,29 @@ function user_filter_form() {
 
   foreach ($filters as $key => $filter) {
     $names[$key] = $filter['title'];
-    $form['filters']['status'][$key] = array('#type' => 'select',
-                                         '#options' => $filter['options'],
-                                       );
+    $form['filters']['status'][$key] = array(
+      '#type' => 'select',
+      '#options' => $filter['options'],
+    );
   }
 
-  $form['filters']['filter'] = array('#type' => 'radios',
-                                 '#options' => $names,
-                               );
-  $form['filters']['buttons']['submit'] = array('#type' => 'submit',
-                                            '#value' => (count($session) ? t('Refine') : t('Filter'))
-                                          );
+  $form['filters']['filter'] = array(
+    '#type' => 'radios',
+    '#options' => $names,
+  );
+  $form['filters']['buttons']['submit'] = array(
+    '#type' => 'submit',
+    '#value' => (count($session) ? t('Refine') : t('Filter')),
+  );
   if (count($session)) {
-    $form['filters']['buttons']['undo'] = array('#type' => 'submit',
-                                            '#value' => t('Undo')
-                                          );
-    $form['filters']['buttons']['reset'] = array('#type' => 'submit',
-                                             '#value' => t('Reset')
-                                           );
+    $form['filters']['buttons']['undo'] = array(
+      '#type' => 'submit',
+      '#value' => t('Undo'),
+    );
+    $form['filters']['buttons']['reset'] = array(
+      '#type' => 'submit',
+      '#value' => t('Reset'),
+    );
   }
 
   drupal_add_js('misc/form.js', 'core');