Cleaning up markup, typos