Refactoring, including url counts