Some cleaning and simplifications