Refactors archive ordering