Refactored function calls