Cleaning, tweaking and renaming