typo and removing cruft