Added formatting/content from r7rs