Simplified some regular expressions