Applied furnace refactoring