manage: orders refactoring