brainless conversion to python 3
make it less readable
lots of fixes ?
merge with master