CODE QUAKE: detangle some things, tangle others