Pep8 - clean adn simplify.