clean up and pep8 as much as I can

clean up and pep8 as much as I can your code