More regex improvement