more pep8
removing weird leftover shit
one more passes