Some cleaning and corrects