Slight regex improvement