Feature 1 ip based address

minor cleanup