Code Cleanup
Code cleanup
Consolidated toggle code