Doc in .NET client, minor refactoring