Moved responsibility for formatting entirely to templates.