[ref] Refactory for consistent message syntax.
[ref] Refactory for consistent message syntax.