Clean up and additional regex.