[COOK-3928] - Refactoring for readability and maintainability
[COOK-3928] - Refactoring for readability and maintainability