Simplified regex expressions