clean up regex
Clean up