More format tweaking