Refactoring Website