@garcia-jj refactoring made =)