That is an excellent idea on the masking tape and numbering them. I usually just arrange them in a row in a place where there is no danger of them being somehow disturbed, but your way is definitely better.

He didn't do any cleaning and I didn't have it hot tanked either. Would have had to buy new cam bearings and labor for installation in addition to the $50 for the hot tanking. I will scrub it down with detergent then pressure wash it. The bores will then be wiped with a white rag soaked in diesel oil and repeat this process until I get a clean rag. That is very time consuming, but it is necessary. Some say automatic transmission fluid is better than diesel oil. I may try that this time.