Refactor: change arg order to modify