Refactoring + Added chat message to cleaner