refactoring - function names according to pep08 complete