Update to psr-4
Small refactoring, remove duplicate line
Add link()