Small cleanup
Introduced the per_site dictionaries