remove some cruft; edit comments