Refactored the date phrase builder