PEP8 and other cleanup