Fix up formatting again