Refactor remaining toggle functions