Refactor the Advanced & Quick Order Functions