Tidying up and Start on FuelLessFurnaces