pep8 + misc