Refactored site selectors in their module
Removed some self.explanatory text