Revert grid formatting, simplify.