Lots of cleanup and formatting, caching urls and gfy urls as well, because why not?