Avoiding some repetition

Revisalo y merge