Improved formatting, syntax highlight, typos