Minor changes and simplifications