CONN-234:Fixed PR comments and formatted the source