diff --git a/date.field.inc b/date.field.inc
index 7aef97b..74c2b12 100644
--- a/date.field.inc
+++ b/date.field.inc
@@ -28,7 +28,7 @@ function date_field_formatter_info() {
       'settings' => array(
         'interval' => 2,
         'interval_display' => 'time ago',
-        'use_end_date' => false,
+        'use_end_date' => FALSE,
       ),
     ),
     'date_plain' => array(
diff --git a/date_api/theme/theme.inc b/date_api/theme/theme.inc
index 0a57ecd..e4cc5d6 100644
--- a/date_api/theme/theme.inc
+++ b/date_api/theme/theme.inc
@@ -194,7 +194,7 @@ function theme_date_calendar_day($variables) {
 function theme_date_time_ago($variables) {
   $start_date = $variables['start_date'];
   $end_date = $variables['end_date'];
-  $use_end_date = isset($variables['use_end_date']) ? $variables['use_end_date'] : false;
+  $use_end_date = isset($variables['use_end_date']) ? $variables['use_end_date'] : FALSE;
   $interval = !empty($variables['interval']) ? $variables['interval'] : 2;
   $display = isset($variables['interval_display']) ? $variables['interval_display'] : 'time ago';
 
@@ -204,7 +204,7 @@ function theme_date_time_ago($variables) {
   }
 
   // We use the end date only when the option is checked.
-  if ($use_end_date){
+  if ($use_end_date) {
     $date = date_format($end_date, DATE_FORMAT_UNIX);
   }
   else {
diff --git a/date_popup/date_popup.module b/date_popup/date_popup.module
index a03132e..3b2f340 100644
--- a/date_popup/date_popup.module
+++ b/date_popup/date_popup.module
@@ -619,7 +619,7 @@ function date_popup_validate($element, &$form_state) {
 function date_popup_input_date($element, $input, $auto_complete = FALSE) {
   if (empty($input) || !is_array($input) || !array_key_exists('date', $input) || empty($input['date'])) {
     //check if there is no time associated in the input variable. This is the exception scenario where the user has entered only time and not date.
-    if(empty($input['time']))
+    if (empty($input['time']))
       return NULL;
   }
   date_popup_add();
@@ -634,7 +634,7 @@ function date_popup_input_date($element, $input, $auto_complete = FALSE) {
   $datetime .= $has_time ? ' ' . trim($input['time']) : '';
   $date = new DateObject($datetime, $element['#date_timezone'], $format);
   //if the variable is time only then set TimeOnly to TRUE
-  if(empty($input['date']) && !empty($input['time']) ){
+  if (empty($input['date']) && !empty($input['time']) ) {
     $date->timeOnly = 'TRUE';
   }
   if (is_object($date)) {
diff --git a/date_views/includes/date_views_filter_handler.inc b/date_views/includes/date_views_filter_handler.inc
index c0c249f..ae6944e 100644
--- a/date_views/includes/date_views_filter_handler.inc
+++ b/date_views/includes/date_views_filter_handler.inc
@@ -93,7 +93,7 @@ class date_views_filter_handler extends date_views_filter_handler_simple {
         $this->related_table_alias = $this->query->ensure_table($field['table_name'], $this->relationship);
       }
       else {
-        $this->related_table_alias = null;
+        $this->related_table_alias = NULL;
       }
       $table_alias = !empty($this->related_table_alias) ? $this->related_table_alias : $field['table_name'];
       $field_name = $table_alias . '.' . $field['field_name'];