Addapted the fluid manager to the code styling