pep8, some naming changes