Flat the if-else logic
Keep `-` in UUID. Increase varchar to 36 length.