fixed a bunch of pep8 consistency issues