Minor structure update..