pep8 format + fixes