CSHARP-1047: Finished improvement

For further information read: https://jira.mongodb.org/browse/CSHARP-1047