diff --git a/appengine/storage.py b/appengine/storage.py
index 478d1f25d..e90375bf1 100644
--- a/appengine/storage.py
+++ b/appengine/storage.py
@@ -23,7 +23,6 @@ __author__ = "q.neutron@gmail.com (Quynh Neutron)"
 import cgi
 import hashlib
 from random import randint
-from datetime import timezone
 from google.cloud import ndb
 
 
@@ -31,8 +30,7 @@ class Xml(ndb.Model):
   # A row in the database.
   xml_hash = ndb.IntegerProperty()
   xml_content = ndb.TextProperty()
-  last_accessed = ndb.DateTimeProperty(auto_now = true)
-
+  last_accessed = ndb.DateTimeProperty(auto_now=True)
 
 def keyGen():
   # Generate a random string of length KEY_LEN.
@@ -74,19 +72,14 @@ def keyToXml(key_provided):
   client = ndb.Client()
   with client.context():
     result = Xml.get_by_id(key_provided)
-
   if not result:
     xml = ""
   else:
-    xml = result.xml_content
-    # Update row to include last accessed time--because last_accessed is set to
-    # auto_now, any write updates the time.
+    # Put it back into the datastore immediately, which updates the last
+    # accessed time.
     with client.context():
-      row = Xml(id = key_provided,
-        xml_hash = result.xml_hash,
-        xml_content = result.xml_content)
-      row.put();
-
+      result.put()
+    xml = result.xml_content
   return xml