Improved Comment Regex