refactor soluvas.web