Some cleaning and documentation fixed