Cleaned up toggle switch