cleaned up toggle