Fix typos and iprove style