Some cosmetic changes

Changed decision tree for py2 / py3 to simpler one, and changed the regex to work simpler.

If we use `findall` it makes no sense to precompile the expression.