Rfc6810 bis

pull request for reviewing code
the braces are unnecessary here