pep8 fixes, removing some functions that aren't used