cleanup and rename in matcher