py3 - cleanup code to
py2 - cleanup to go along with python3 code
warning: breaks the package - make py3 code use _pb2 suffix so it is like the python2 code
update the python 2 generator so it is also compatible with python 3