Strip out extraneous comments, rename "algorithm" to "protocol"
Add renegotation back
Fix reformat