Some PEP8 style improvements + Python3