Cleanup

- Comment code
- Move logic to display urls in a separate function