Formatting and syntax highlight fix