Sealer - more speedup and code tidyup