Refactor site