Minor cleanup; warning: UNTESTED
Fixed desensitize