typo and less cruft