Restructure to reduce some repeat.