Small niceness update

- Tried to clean up some code, simplify some code and exposed URLs to
the inspector