FLUID-5558: Tweaks to formatting