Refactoring website