Quick refactor
Updated Orion statistics...