Refactoring and avoid boilerplate code

@viavansi/movilidad 
It's not my war