FLUID-5466: Trying to fix some formatting