refactor remove/add to toggle