Review, tidy, rename