Formatting and syntax fixes.