Format improved

I hope so, at least