Fix typos and add minor style improvements