Cristian Velasquez Ramos minor refactor