Refactor ordering methods