undoing autoformatting that created more differences than necessary...