Little refactor of 74bb8639f5ce9fc6de067098605c8b503e0c3713 by
@rsrdesarrollo