Some cleaning, uuid generation