changed method names to fit pep8