Cosmetics to match documentation + Q NuGet pkg