rename MessageData model
code cleanup
code cleanup
updating data models