Just haven't finished yet. Was building Formatter while leaving Formatting intact until ready to swap out the relevant calls. So yep, still duplication and the idea is to get rid of Formatting entirely and only use Formatter. Only really handled this where distance is concerned, not the date yet.