Massive refactoring Python2 compatibility broken