deleting commented-out code, renaming a thing or two