pep8 made a few things ugly. cleaning it up.