Refactor method signature