Refactoring site controller