Furnace code cleanup