Minor cleanup for typos and such