Refactor arguments