Improve regex

Indentation and captures are improved.