02_Web refactoring