Formatting and syntax fixes