Remove unnecessary variables
Add new date format helper