Minor stylistic and syntactic modifications