Refactor common arguments