refactoring some more links