Cleanup: removed unnecessary parens
Refactored action message construction