Typos and cleanups