Refactored fluids and fixed FluidUtil misuse.