Improve formatting, fix typos.