some cleaning, Ore class added