code cleanup
clean up code, and implement a a GUID creation utility.