refacto APP