refactor website2