Clean up

Altered generateUuid function to different start and end blocks