ARIA code refacto