IMP Some PEP8 improvements