Cleanup. Refactored Orders