refactor to follow python name convention