Static call refactoring