Refactored args code.