Improved URLs, as well as aesthetics