Some cleaning and putting in order