Regex non-capturing groups added

Great stuff! I noticed the regex could become a little clear by using non-capturing groups.