Address the non-SSL comments in round 2 of the code review
Address the SSL-related comments in round 2 of the code review