Added messageId property
Minor formatting