Merge Python2 and Python3 and Major style fixes