I have a Tokheim 36B pump I am going to restore. I have decided not to gut it. So I taken it apart not to bad off a smell, but moved it approximately 1000 miles in pieces. The pump it self is in three pieces including the motor, pump, and domed part. The old gas smell is worse now from all the agitation. I will sandblast it and paint it in the future. I believe that some will spray expandable foam insulation in the in and out of each peice. Is this the way to go, or should I use a different method?