pep8 and other simple fixes