Syntax highlighting fix and other formatting