Refactor web