Refactoring and avoid boilerplate code

@viavansi/movilidad