More autoformatting