Order decorator refactor