Clean code slightly, ores now generate...