Tweaked the date formatter