Refactored order