Refactoring SiteController