update to have function names conform to PEP-8