#24 Refactoring Souce Code Include Chatting Connection