Small bits of cleanup in the site class, including better organization.