A few tweaks to the format.