A little bit of PEP8 and other cleanup