Tweak code style settings; reformat