Hiperlinks refactoring