Tidy-up code
Tweak multithreaded unload\upload