Improvements, simplifications