Simplifications and minor corrections