Refactoring the toggles a bit.