FLUID-5026: Linted and cleaned up a bit