Get command before saving
Fix typo
Cleanup message model