Make more python3 like