Got fluid properties closer!
Refactoring.