refactorized website