changed link, small refactoring