Fix typos and clean up