Formatting and syntax updates