new autoformatting really cleans things up