Fix typos and minor cleanup