Small modification to make the code more readable.
Some modifications to the UUIDs.