made function names more pythonic