fixed function names for pep8, fixes #30