many simplifications, cosmetics.