updating function names to conform to pep-8