Fix formatting once and for all