clean and rename stuff