Simplified template variables
Cleaned up datestamp template variable