Minor simplifications and corrections