EZP-21118: Applied refactoring in CorsBundle PR