minor refactoring on message's uuid