Heat context code refactor part 2