refactor www