Improved formatting and fixed typos