Improve moisture computation