tidy and rename