Fix typos and style