Improvements and simplifications