Nesting and code quality updated

Gauravrequested to merge
issue/drupal-3332444:3332444-refactor-claros-system-admin--admin-list into 10.1.x

Closes #3332444

Merge request reports