MessageModel: Too many Overrides!
Cleanup: Safety and code style fixes