more PEP-8 style updates