Add Fireworks Vendor. Clean Up Code.