refactroing sip/address