Many updates to format and syntax.