refactoring in function names