Fix unescaped regular expression character
Clean up and finish regex implementation