Minor cleanup and rename for dates