pep8 cleanup of naming