Small improvements to the regex by kikuchi