improve regex walker