Refactor to args