cleanup comments and the GuidStruct type some