TNT and Explosion refactoring