Some cosmetic changes

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

sorry about that, i'm still new in github and open-source :)