Refactored site