modulare refactoring + phone full validation