Updated date variables to use date formats instead of custom