pep8 and other naming updates.