Fix typos and format