Major PEP8/style cleanup