Rename for pep8 convention
Update pep8 and new function