refactoring sip/message