Invert logic to match the parameter that disables Toopher
Cleanup and comments