minor changes to more PEP-8 compliant