Cleaned up regex