Refactoring for shorter calls