Order items validity and refactoring