removed old comments and fixed pep8 stuff