Cleanup based on review.  Rename button.