Formatting among other tweaks.