Refactored method args