A little cleaning and restructuring.