Minor refinements to code/doc clarity. Randome uuid token gen is now seperated.