396 Refactoring for arguments