Negating boolean options

Also refactor to make things easier later