Refactor and optimized web