Expansion on cl-format. Tweak to format.