(fix) #5 correct UDP handling to not include the port. Code cleanup