Cloak freeze and slay, more compact code and rewrites