Refactoring for better complete calls.