more refactoring
refactored to use Order-Item