ISP-to-Siteslist code refactoring