Refactor args