CONN-1368: Addressed review comments and few other format changes