Refactor y DRY