Fix some typos, make readability improvements