Refactor to remove an unnecessary param