Fix whitespace
Add syntax highlighting to other bits of code