Refactor website