Cleaning and simplifications