Some more cleaning and structural changes.