Fluids: Refactor a few methods