Tweak and reformat