I would start with the State Department.
That is an excellent suggestion. There should be a litmus test for all government politicians; require them to be “Americans” first.
If 8 year term limit is good for a president then all house and senate need 8 year term limits [house members continue to run for office every 2 years and senators run for office 4 years]. This will prevent senators and congresscritters from building kingdoms unto themselves and will go out of office with nominal net worth. Now these bozos come to office with small net worth leave very wealthy bozos.