Optimize

These might be better placed in a helper so it can be re-used by other datetimes that need formatting.