Addressing IANA comments.
Tweaking formatting.