code cleanups
introducing UDP support