improve wording; remove some unused and commented-out code