Regex parsing + remove dep

Just reading through your code, figured might as well PR.