refactoring calls