Better autoformatting