Clean up toggling logic