pep8 fixes + remove old commented code