Fixes according to 2to3
Fixes according to flake8 (conform PEP 8)