Refactored web