typos and cruft-removal