Numerous changes to formatting and syntax.