Fix regex match.
Clean up.