refactored non-pythonic function names