Assorted (minor) cleanups
Moved timezone logic to storage.py