fix ip address issue
fixed ip address issue
more cleanup and segmenting