refactor baja micro