Add comment
Prefer methods of members
Create Message class and move work over to that