Some more rewordings and reformattings