pep8 fixes
Better logging.