Small comments from reading over new structure.