Explosive Barrel refactoring