Some cleaning and improved doc