#1111 - Rollback Refactoring
- Maintain extracted generate_url method of the url method to reduce complexity