Match up detwilify with twilify
Removes duplication and simplifies twilify/detwilify