Above comment and observation, don't actually change it now, at some point I will look at pulling common formats into a trait...