Fix formatting RFC 87