More pep8 enchancements. Data is still an issue.