Refactored heat generation/consumption