Refactoring /website