Nested types, cleaning, more