Improved code for setting the value of delivery status
Tiny code refactoring
Tiny code refactoring