more PEP8 conformity