diff --git a/ctools/content_types/entity_view.inc b/ctools/content_types/entity_view.inc
index 9432637..e505633 100644
--- a/ctools/content_types/entity_view.inc
+++ b/ctools/content_types/entity_view.inc
@@ -31,7 +31,7 @@ function entity_entity_view_content_type_content_types() {
   $types = array();
   $entities = entity_get_info();
 
-  foreach($entities as $entity_type => $info) {
+  foreach ($entities as $entity_type => $info) {
     if (entity_type_supports($entity_type, 'view')) {
       $types[$entity_type] = array(
         'title' => t('Rendered @entity_type', array('@entity_type' => $info['label'])),
diff --git a/entity.module b/entity.module
index 08e4662..6966776 100644
--- a/entity.module
+++ b/entity.module
@@ -538,7 +538,7 @@ function entity_var_export($var, $prefix = '') {
       $output .= ')';
     }
   }
-  else if (is_bool($var)) {
+  elseif (is_bool($var)) {
     $output = $var ? 'TRUE' : 'FALSE';
   }
   else {
@@ -570,16 +570,16 @@ function entity_var_json_export($var, $prefix = '') {
     }
     // Use several lines for long content. However for objects with a single
     // entry keep the key in the first line.
-    if (strlen($content = implode(", ", $values)) > 70 && ($use_array || count($values) > 1)) {
-      $output .= "\n  " .  implode(",\n  ", $values) . "\n";
+    if (strlen($content = implode(', ', $values)) > 70 && ($use_array || count($values) > 1)) {
+      $output .= "\n  " . implode(",\n  ", $values) . "\n";
     }
     elseif (strpos($content, "\n") !== FALSE) {
-      $output .= " " .  $content . "\n";
+      $output .= " " . $content . "\n";
     }
     else {
-      $output .= " " .  $content . " ";
+      $output .= " " . $content . ' ';
     }
-    $output .= $use_array ? "]" : "}";
+    $output .= $use_array ? ']' : '}';
   }
   else {
     $output = drupal_json_encode($var);
diff --git a/entity.test b/entity.test
index eb885c2..aaebc61 100644
--- a/entity.test
+++ b/entity.test
@@ -1197,8 +1197,8 @@ class EntityMetadataIntegrationTestCase extends EntityWebTestCase {
    */
   function testUserProperties() {
     $account = $this->drupalCreateUser();
-    $account->login = time();
-    $account->access = time();
+    $account->login = REQUEST_TIME;
+    $account->access = REQUEST_TIME;
     $wrapper = entity_metadata_wrapper('user', $account);
     foreach ($wrapper as $key => $value) {
       $this->assertValue($wrapper, $key);
@@ -1495,7 +1495,7 @@ class EntityMetadataIntegrationTestCase extends EntityWebTestCase {
       case 'duration':
         return 1;
       case 'date':
-        return time();
+        return REQUEST_TIME;
       case 'boolean':
         return TRUE;
       case 'token':
diff --git a/entity_token.tokens.inc b/entity_token.tokens.inc
index b0b9878..f9ec7f7 100644
--- a/entity_token.tokens.inc
+++ b/entity_token.tokens.inc
@@ -107,7 +107,7 @@ function entity_token_token_info_alter(&$info) {
         $info['tokens'][$token_type][$name]['dynamic'] = TRUE;
         $help = array();
         foreach ($property['property info'] as $key => $property_info) {
-          $help[] = $key . ' (' . $property_info['label'] .')';
+          $help[] = $key . ' (' . $property_info['label'] . ')';
         }
         $info['tokens'][$token_type][$name]['description'] .= ' ' . t('The following properties may be appended to the token: @keys',
           array('@keys' => implode(', ', $help))
diff --git a/includes/entity.property.inc b/includes/entity.property.inc
index b9a4586..7b1dac7 100644
--- a/includes/entity.property.inc
+++ b/includes/entity.property.inc
@@ -392,7 +392,7 @@ function entity_property_verbatim_get($data, array $options, $name, $type, $info
  */
 function entity_property_verbatim_date_get($data, array $options, $name, $type, $info) {
   $name = isset($info['schema field']) ? $info['schema field'] : $name;
-  return is_numeric($data[$name]) ? $data[$name] : strtotime($data[$name], time());
+  return is_numeric($data[$name]) ? $data[$name] : strtotime($data[$name], REQUEST_TIME);
 }
 
 /**
diff --git a/includes/entity.wrapper.inc b/includes/entity.wrapper.inc
index 3e3c150..e4d3109 100644
--- a/includes/entity.wrapper.inc
+++ b/includes/entity.wrapper.inc
@@ -1131,11 +1131,11 @@ class EntityMetadataWrapperIterator implements RecursiveIterator {
     return isset($this->keys[$this->position]);
   }
 
-  public function hasChildren () {
+  public function hasChildren() {
     return $this->current() instanceof IteratorAggregate;
   }
 
-  public function getChildren () {
+  public function getChildren() {
     return $this->current()->getIterator();
   }
 }
diff --git a/modules/callbacks.inc b/modules/callbacks.inc
index 64d020a..80ee5fd 100644
--- a/modules/callbacks.inc
+++ b/modules/callbacks.inc
@@ -210,7 +210,7 @@ function entity_metadata_system_get_properties($data = FALSE, array $options, $n
       return $GLOBALS['user']->uid ? $GLOBALS['user']->uid : drupal_anonymous_user();
 
     case 'current_date':
-      return time();
+      return REQUEST_TIME;
 
     case 'current_page':
       // Subsequent getters of the struct retrieve the actual values.
diff --git a/views/handlers/entity_views_field_handler_helper.inc b/views/handlers/entity_views_field_handler_helper.inc
index fcc2b38..2a44e6d 100644
--- a/views/handlers/entity_views_field_handler_helper.inc
+++ b/views/handlers/entity_views_field_handler_helper.inc
@@ -356,7 +356,7 @@ class EntityFieldHandlerHelper {
           if ($field == 'entity object') {
             $return[] = $wrapper->value();
           }
-          elseif(isset($wrapper->$field)) {
+          elseif (isset($wrapper->$field)) {
             $return[] = $wrapper->$field->value(array('identifier' => TRUE));
           }
         }