docstrings; some refactor
Name server reduced