Cleannup of code and beginnings of exploding cake block