pep8 and old assumptions removed.