Only minor changes and simplifications