Refactoring for arguments