Raleigh retools Fourth of July fireworks plan