CONN-1571:Fix Spacing issues and commented lines(Addressing PR Comments