got rid of some debugging and pep8 fixes