cleanup after rebase on PEP8