changed methods name and pep8 fix