Remove: wrapping parse_url() is unnecessary
Add: more method signatures