Better config logic, to be able to alternate disable/enable with the setting value
Nicer spacing