Refactor evaporation

Code has been refactored and this second approximation looks better.
Untested.