refactoring function names