Cleaner linking and docstrings