Ethanol Diamonds?

Do most of you all keep your HTE separate from the diamonds? or do most of you add all of the HTE back to the diamonds? what are you packaging in? I find that the suace gets into the threads of the screw cap. Any tips would be helpful!