Refactored args