Some cleaning and renaming