Refactoring and avoid boilerplate code

@viavansi/movilidad 
Solving incorrect problem here ;)