cleaning up some stuff, ensuring PEP conformance.